471 Commits

Author	SHA1	Message	Date
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
RePixelatedMC	0445b6fe6e	Merge branch 'iris4' of https://github.com/VolmitSoftware/Iris into mca	2024-07-29 20:41:25 +02:00
RePixelatedMC	a0719117ad	Iris wont fail loading the rest of the worlds if 1 fails	2024-07-29 20:40:01 +02:00
RePixelatedMC	7ae846af6f	eghum	2024-07-29 20:16:15 +02:00
RePixelatedMC	fe5bb67973	okey back to normal	2024-07-29 18:51:07 +02:00
Julian Krings	295fe16f8f	Merge remote-tracking branch 'refs/remotes/origin/v1_21' into iris4 ... # Conflicts: # core/src/main/java/com/volmit/iris/core/commands/CommandDeveloper.java # core/src/main/java/com/volmit/iris/core/nms/v1X/NMSBinding1X.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	2024-07-29 18:11:11 +02:00
Julian Krings	2ea54b7f2f	1.21 nms bindings	2024-07-24 19:59:01 +02:00
Brian Fopiano	e90e3901f5	Merge pull request #1109 from VolmitSoftware/fixes ... Fixes	2024-07-23 15:43:33 -04:00
Brian Fopiano	864c7ae27c	Merge pull request #1106 from VolmitDev/custom_data ... improve custom block/item api to allow custom settings	2024-07-23 15:43:04 -04:00
Julian Krings	6d104a2d1c	fix y-coordinate for getting biome	2024-07-23 20:05:05 +02:00
Julian Krings	89e754245d	add maxTries to IrisLootTable to prevent crash	2024-07-21 16:00:02 +02:00
Julian Krings	4c68d99c6f	fix returning black color in biomes without a color override	2024-07-21 15:50:45 +02:00
Julian Krings	f8f0a65f0a	add debug info to the updater	2024-07-21 15:25:31 +02:00
Julian Krings	5ad848fc54	Revert "Revert "Merge branch 'mca' into jigsaw_dist"" ... This reverts commit 55017b9a	2024-07-09 20:24:21 +02:00
Julian Krings	af80f882da	add slope condition to sear/shore/surface decorators	2024-07-09 16:25:07 +02:00
Julian Krings	84ce7372c3	implement dimension zoom options	2024-07-09 16:23:32 +02:00
Julian Krings	e31d39c5f7	fix worldedit selection not updating	2024-07-09 16:19:56 +02:00
Julian Krings	2296c1368b	fix WorldEditLink	2024-07-09 16:19:22 +02:00
RePixelatedMC	956e511fe0	Merge remote-tracking branch 'origin/master'	2024-07-04 22:02:42 +02:00
RePixelatedMC	e427887f8c	Scary	2024-07-04 22:00:50 +02:00
Julian Krings	88ea43fbbe	fix post processing for custom blocks not applying to objects	2024-06-28 18:14:52 +02:00
Julian Krings	29526a80a9	improve custom block/item api to allow custom settings	2024-06-25 13:35:34 +02:00
Julian Krings	48f901fc8c	handle null pointer	2024-06-25 13:33:44 +02:00
Julian Krings	6c3f3dc889	update oraxen api	2024-06-24 13:17:11 +02:00
Julian Krings	743410d3ee	add nms method to get biome color	2024-06-24 13:16:56 +02:00