Brian Neumann-Fopiano
768fa7beb5
v+
2024-04-19 02:47:02 -04:00
Julian Krings
6645eb9806
Merge branch 'VolmitSoftware:master' into fix_jigsaw
2024-04-18 16:04:30 +02:00
CrazyDev22
d7a283c99f
fix underwater jigsaw placement
2024-04-18 16:00:47 +02:00
Brian Fopiano
8f019cd794
Merge pull request #1088 from RePixelatedMC/PixelatedDev
...
3.2.5 iris
2024-04-18 07:13:52 -04:00
CrazyDev22
c1d9cc62cb
woops
2024-04-17 21:21:18 +02:00
Julian Krings
010a1e9e91
Merge branch 'VolmitSoftware:master' into fix_jigsaw
2024-04-17 21:16:08 +02:00
CrazyDev22
856c926cde
add min distance to jigsaw structures
2024-04-17 21:15:15 +02:00
RePixelatedMC
72ed312654
wops
2024-04-16 18:09:03 +02:00
RePixelatedMC
c7fe4723f7
Merge remote-tracking branch 'origin/master' into PixelatedDev
2024-04-16 17:18:51 +02:00
RePixelatedMC
bfbea83a4a
- Fixed NMS biome height.
...
- Improved /iris load
- Improved Vanilla height converter
- Removed WorldCreation unstable message
2024-04-16 17:18:02 +02:00
RePixelatedMC
55c58fe896
Merge pull request #1087 from RePixelatedMC/PixelatedDev
...
Should work
2024-04-16 16:34:12 +02:00
RePixelatedMC
72949e0950
Update IrisSettings.java
2024-04-16 16:32:52 +02:00
CrazyDev22
61c0ddb15b
fix random jigsaw rotation and offset
2024-04-16 13:29:06 +02:00
Brian Neumann-Fopiano
9ac4024e4e
v+
2024-04-15 11:43:09 -04:00
RePixelatedMC
7fb2a51a33
sync
2024-04-12 17:08:13 +02:00
RePixelatedMC
5b7c0b2bc3
Merge branch 'PixelatedDev' of https://github.com/RePixelatedMC/Iris into PixelatedDev
...
# Conflicts:
# core/src/main/java/com/volmit/iris/engine/object/IrisBiome.java
# core/src/main/java/com/volmit/iris/engine/object/IrisBiomeGeneratorLink.java
2024-04-09 20:07:50 +02:00
RePixelatedMC
fc15175ff9
Improved?
2024-04-09 20:06:32 +02:00
RePixelatedMC
1eec3a09c1
now it should work
2024-04-09 18:05:27 +02:00
RePixelatedMC
60d349dd8b
test
2024-04-09 17:05:43 +02:00
RePixelatedMC
0c8d144ffb
Merge remote-tracking branch 'VolmitDev/smartHeight' into PixelatedDev
2024-04-09 17:04:45 +02:00
RePixelatedMC
b898f73a05
Fixed another potential mem leak
...
Added the base of smart320height
2024-04-09 17:04:32 +02:00
CrazyDev22
c2b9b0ba0e
add smartVanillaHeight
2024-04-09 16:52:14 +02:00
RePixelatedMC
206a4e9057
Revert "sync laptop"
...
This reverts commit 63b8a935ae65c254b75921d4308fcce1a9c05fc5.
2024-04-06 17:07:14 +02:00
RePixelatedMC
83a0a7dd54
sync laptop
2024-04-06 17:06:06 +02:00
RePixelatedMC
63b8a935ae
sync laptop
2024-04-05 18:43:30 +02:00
CrazyDev22
16affd11cc
fix HMCLeaves leave decay
2024-04-04 23:46:14 +02:00
CrazyDev22
33b0dec9da
fix ClassCastException when replacing to IrisBlockData
2024-04-04 23:45:25 +02:00
Brian Neumann-Fopiano
121a463788
v+
...
Woot
2024-04-03 03:03:32 -04:00
Julian Krings
3625e70948
Merge pull request #1085 from VolmitDev/impl_mmoitem
...
Impl MMOItems
2024-04-02 19:03:25 +02:00
CrazyDev22
3d90207172
make MMOItems getItemTypes synchronous to reduce lag
2024-04-02 12:03:00 +02:00
CrazyDev22
ca7dc19c81
make mmoitems item creation synchronous
2024-04-01 23:20:11 +02:00
CrazyDev22
d0f16dbbc4
fix using Type::toString instead of Type::getId for mmoitems
2024-04-01 23:18:41 +02:00
CrazyDev22
fd91c223b7
add unload debug tools
2024-04-01 22:08:28 +02:00
CrazyDev22
93690b766c
implement MMOItemsDataProvider
2024-04-01 17:26:33 +02:00
CrazyDev22
cc4af9950b
fix scanning for item provider instead of block provider to processUpdate
2024-04-01 17:26:10 +02:00
Brian Fopiano
a6281483dd
Merge pull request #1084 from RePixelatedMC/PixelatedDev
...
Pixelated dev
2024-03-31 12:45:06 -04:00
RePixelatedMC
f587816b30
merges
2024-03-31 18:33:35 +02:00
RePixelatedMC
eea3c3ab0b
Merge remote-tracking branch 'origin/master' into PixelatedDev
...
# Conflicts:
# core/src/main/java/com/volmit/iris/core/nms/INMSBinding.java
# nms/v1_19_R1/src/main/java/com/volmit/iris/core/nms/v1_19_R1/NMSBinding.java
# nms/v1_19_R2/src/main/java/com/volmit/iris/core/nms/v1_19_R2/NMSBinding.java
# nms/v1_19_R3/src/main/java/com/volmit/iris/core/nms/v1_19_R3/NMSBinding.java
# nms/v1_20_R1/src/main/java/com/volmit/iris/core/nms/v1_20_R1/NMSBinding.java
# nms/v1_20_R2/src/main/java/com/volmit/iris/core/nms/v1_20_R2/NMSBinding.java
# nms/v1_20_R3/src/main/java/com/volmit/iris/core/nms/v1_20_R3/NMSBinding.java
2024-03-31 18:25:26 +02:00
RePixelatedMC
ba68ab9e06
f
2024-03-31 17:58:47 +02:00
RePixelatedMC
eb94d97ea4
- Fixed caves breaksurface
...
- changes
2024-03-31 17:53:10 +02:00
Brian Neumann-Fopiano
04ad02719c
d
2024-03-30 18:48:00 -04:00
Brian Fopiano
f68f25b92f
Merge pull request #1083 from VolmitDev/fix_object_collision_check
...
fix object collision check
2024-03-30 17:51:40 -04:00
Brian Fopiano
767cca36c8
Merge pull request #1080 from svdgoor/no-camel-1-19-R3
...
Cancels Camel spawns on 1-19-R3
2024-03-30 17:50:44 -04:00
Brian Fopiano
b30172fe89
Merge pull request #1082 from VolmitDev/shut_up_spigot
...
Remove usage of System.out
2024-03-30 17:49:31 -04:00
CrazyDev22
b2934b0cc2
fix object collision check
2024-03-27 19:02:20 +01:00
RePixelatedMC
50686795d0
- Added /iris what region
...
- Sort of Fixed EngineStatus
- Added /iris hasAccess
- Added /iris irisworlds/worlds
- Added Some dev commands
- Redid / improved the mantle tectonic unload
- Convert still not working so ignore that
- Cleaned Iris of IrisPackBenchmarking.java im redoing it on second thought.
- Adjusted build.gradle
- Renamed some tectonic stuff
- Fixed Eta
- Fixed entities spawning inside blocks or at least it should.
- Lib update fixes all the iris titles/actionbars
- Cave spawning adjustments, now they get engine height if caveStartHeight is too large. <optional>
- Perhaps more?
2024-03-20 11:32:44 +01:00
CrazyDev22
5561a4dc2f
fix wrong color bug
2024-03-20 08:46:56 +01:00
CrazyDev22
15b8780e17
remove usage of System.out
2024-03-20 08:44:00 +01:00
svdgoor
15c4d312cb
Merge remote-tracking branch 'origin/master'
2024-03-18 17:29:02 +01:00
svdgoor
ccbea89253
prevent spawning camels on 1.19.R3
2024-03-18 17:28:08 +01:00
