mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-06-18 14:50:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,953 Commits 13 Branches 114 Tags
8fc70f42fc68670585b1767a8c7e1b3fa7ee0050
Commit Graph

395 Commits

Author SHA1 Message Date
Julian Krings 8fc70f42fc Merge branch 'v3.4.3' into iris4 
# Conflicts:
#	core/src/main/java/com/volmit/iris/engine/IrisEngine.java
 2024-08-17 01:00:36 +02:00
Julian Krings fc793592f7 fix old object loading 2024-08-17 00:45:58 +02:00
Julian Krings b468478fcb separate tile data into its own option in IrisBlockData 2024-08-15 18:00:18 +02:00
Julian Krings b6dc934198 fix getEngineData NullPointer 2024-08-15 17:12:56 +02:00
Julian Krings 344c50154a Merge branch 'v3.4.2' into iris4 
# Conflicts:
#	core/src/main/java/com/volmit/iris/core/nms/INMSBinding.java
#	core/src/main/java/com/volmit/iris/core/safeguard/ModesSFG.java
#	core/src/main/java/com/volmit/iris/core/service/WandSVC.java
#	core/src/main/java/com/volmit/iris/engine/framework/Engine.java
#	core/src/main/java/com/volmit/iris/engine/object/TileBanner.java
#	core/src/main/java/com/volmit/iris/engine/object/TileData.java
#	core/src/main/java/com/volmit/iris/engine/object/TileSign.java
#	core/src/main/java/com/volmit/iris/engine/object/TileSpawner.java
#	core/src/main/java/com/volmit/iris/engine/platform/BukkitChunkGenerator.java
#	core/src/main/java/com/volmit/iris/util/matter/TileWrapper.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
#	nms/v1_20_R4/src/main/java/com/volmit/iris/core/nms/v1_20_R4/NMSBinding.java
#	nms/v1_21_R1/src/main/java/com/volmit/iris/core/nms/v1_21_R1/NMSBinding.java
 2024-08-14 21:53:13 +02:00
Julian Krings f58078e8a0 implement dynamic tile entities 2024-08-14 20:02:08 +02:00
Julian Krings b6457e47e6 fix async tile state 2024-08-13 21:35:17 +02:00
Julian Krings d275466e1e reformat BukkitChunkGenerator::onWorldInit 2024-08-13 20:25:54 +02:00
Julian Krings f9cb107728 catch getEngineData NullPointer 2024-08-13 20:25:34 +02:00
RePixelatedMC ef93bee0b9 Fixed double hotload and added a tone for hotload, 2024-08-12 22:28:27 +02:00
repixelatedmc 68ad206252 Eh yeah should do 2024-08-12 08:08:23 +02:00
Brian Neumann-Fopiano a0a7b8cb3e . 2024-08-07 20:40:56 -04:00
Brian Neumann-Fopiano ae2600227e Formatting 2024-08-07 20:08:11 -04:00
Brian Neumann-Fopiano ab04a686e9 The Great Copyright Number 3 2024-08-07 19:47:23 -04:00
repixelatedmc efbfad437a Decorators wont be placed above sea level when set to sea_floor 2024-08-07 16:03:21 +02:00
repixelatedmc 9bcb1845b8 magic 2024-08-07 15:29:42 +02:00
repixelatedmc 0f5364982d Merge remote-tracking branch 'origin/iris4' into iris4 2024-08-07 15:01:43 +02:00
repixelatedmc 1b0411e23a Need help on this one. 2024-08-07 15:00:10 +02:00
Julian Krings 29199dc2d2 woops 2024-08-07 14:57:53 +02:00
Julian Krings 3cb5f612c6 use world name as thread id 2024-08-07 14:56:44 +02:00
Julian Krings 3b98b20f73 implement engine services and other improvements 2024-08-07 13:40:17 +02:00
repixelatedmc 90bab2b292 Reset Region cache option. 2024-08-07 11:46:52 +02:00
repixelatedmc 8ad3cdf820 - Decos dont float anymore 
- Decos dont go over fluidheight anymore
 2024-08-07 11:22:55 +02:00
repixelatedmc ca8933541a Merge remote-tracking branch 'origin/iris4' into iris4 2024-08-07 09:19:24 +02:00
Brian Neumann-Fopiano 8572a444fa Making Logo Changes for V4 
This is a simplified image print so my file is not bloated
 2024-08-06 19:18:41 -04:00
repixelatedmc 8dd14c80f0 eh 2024-08-05 10:53:10 +02:00
Julian Krings 61410aea97 iris go brrrr 2024-08-04 16:58:36 +02:00
Julian Krings 86f89bc718 Merge remote-tracking branch 'origin/master' into iris4 
# Conflicts:
#	core/src/main/java/com/volmit/iris/core/nms/INMSBinding.java
#	nms/v1_20_R4/src/main/java/com/volmit/iris/core/nms/v1_20_R4/NMSBinding.java
#	nms/v1_21_R1/src/main/java/com/volmit/iris/core/nms/v1_21_R1/NMSBinding.java
 2024-08-03 18:50:38 +02:00
Julian Krings ceb6c15c97 tall_seagrass isnt sticking out of water anymore 
by RePixelatedMC
 2024-08-03 18:45:44 +02:00
Julian Krings 5be19c7c3c fix nullpointer with headless 2024-08-03 18:43:21 +02:00
Julian Krings 7cf43ad7ab fix world creation 2024-08-03 18:04:37 +02:00
Julian Krings ab30710e2a make PackBenchmark startup show errors 2024-08-03 16:56:17 +02:00
Julian Krings d2ecbc5727 fix datapack dump + change target location 2024-08-03 16:55:39 +02:00
RePixelatedMC 22f9306fa3 eghem 2024-08-03 15:52:24 +02:00
Julian Krings ab3397a373 fix pack download command 2024-08-03 15:30:56 +02:00
RePixelatedMC 6b4a19a525 Merge remote-tracking branch 'origin/iris4' into iris4 2024-08-03 15:25:55 +02:00
RePixelatedMC ad8ff2643b wee 2024-08-03 15:25:23 +02:00
Julian Krings e6f829db31 Merge remote-tracking branch 'origin/master' into iris4 2024-08-03 13:31:09 +02:00
Julian Krings 8e9f78e982 fix region zoom 2024-08-03 13:03:50 +02:00
RePixelatedMC f00e037e26 bug fix + better eta 2024-08-03 10:07:03 +02:00
RePixelatedMC bad3cd27e1 bug fix 2024-08-03 09:09:02 +02:00
RePixelatedMC cad679a808 Fast pregen 2024-08-02 23:17:52 +02:00
Julian Krings 488b76d1d2 add dummy datapack + fix world creation 2024-08-02 18:14:41 +02:00
RePixelatedMC 1e22a65329 whopsie 2024-08-02 18:09:03 +02:00
RePixelatedMC 1477dc037c changes i guess 2024-08-02 17:29:39 +02:00
RePixelatedMC 6174ec04ab changes 2024-08-02 16:31:36 +02:00
RePixelatedMC 1cac86252f Refactors 2024-08-02 15:05:23 +02:00
RePixelatedMC 773065eb56 Advanced world loading! 2024-08-02 14:59:05 +02:00
RePixelatedMC a8524e43b9 dev shit 2024-08-01 13:26:13 +02:00
RePixelatedMC 0a62e222ee No gui errors anymore! 2024-07-30 15:24:26 +02:00