mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-03 00:17:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,995 Commits 21 Branches 103 Tags
Commit Graph

3995 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julian Krings
6c69c69868 Merge branch 'v3.4.3' into v3.4.3-dev 2024-10-27 14:06:17 +01:00
RePixelatedMC
9cd7ad6770 Merge branch 'v3.4.3-dev' of https://github.com/VolmitSoftware/Iris into v3.4.3 2024-10-23 20:27:41 +02:00
RePixelatedMC
b70c9fd4d8 deepslate variant support 2024-10-23 13:50:24 +02:00
RePixelatedMC
412f592e1c removed comment 2024-10-22 21:22:01 +02:00
RePixelatedMC
6c0fa9361f Merge remote-tracking branch 'origin/v3.4.3' into v3.4.3 
# Conflicts:
#	core/src/main/java/com/volmit/iris/engine/actuator/IrisTerrainNormalActuator.java
 2024-10-22 21:20:45 +02:00
RePixelatedMC
b7dcdd2921 yey 2024-10-22 21:20:29 +02:00
RePixelatedMC
1d8acd2d62 Merge remote-tracking branch 'origin/v3.4.3' into v3.4.3 2024-10-22 15:29:05 +02:00
RePixelatedMC
05bf92ca50 huh 2024-10-22 15:28:39 +02:00
RePixelatedMC
dd598d18bf Merge remote-tracking branch 'origin/v3.4.3' into v3.4.3 
# Conflicts:
#	core/src/main/java/com/volmit/iris/engine/actuator/IrisTerrainNormalActuator.java
 2024-10-22 15:24:10 +02:00
RePixelatedMC
cc6de4a46d oh well back to scratch 2024-10-22 15:23:50 +02:00
RePixelatedMC
9950551ecb Help 2024-10-22 14:13:30 +02:00
RePixelatedMC
dfd27ecbff sync 2024-10-22 10:01:48 +02:00
RePixelatedMC
ac5d5793ab cleanup 2 2024-10-19 17:42:35 +02:00
RePixelatedMC
2133a03c21 cleanup 2024-10-19 17:16:29 +02:00
RePixelatedMC
8755449c13 Untested but should work though 2024-10-18 15:36:09 +02:00
Julian Krings
9e40259ca2 fix LegacyTileData not placing 2024-10-17 19:18:11 +02:00
Julian Krings
94a7692735 add force place for stronghold 2024-10-17 18:48:17 +02:00
Julian Krings
86ce02789e woops 2024-10-17 17:49:23 +02:00
Julian Krings
773c8129c9 cleanup and improve merger 2024-10-17 17:44:44 +02:00
RePixelatedMC
dbe9f81091 fixes seed inconsistency and a huge performance bump 2024-10-17 16:03:49 +02:00
RePixelatedMC
288e556f2a weee 2024-10-17 13:53:23 +02:00
RePixelatedMC
70822e37de merger! 2024-10-17 13:30:35 +02:00
Julian Krings
8b803a87f0 rename CrucibleDataProvider to MythicCrucibleDataProvider to fit naming conventions 2024-10-17 11:28:50 +02:00
Julian Krings
3ae6e92eaf woops 2024-10-16 22:05:47 +02:00
Julian Krings
0f3c52a5aa cleanup CrucibleDataProvider and fix furniture support 2024-10-16 21:59:38 +02:00
Schroddinger
747be7aa09 MythicCrucible support. Currently under testing. 
(cherry picked from commit 06d0f0748bfb3a69b663c2c3604b65f52cb4c5c2)
 2024-10-16 21:37:54 +02:00
RePixelatedMC
3f994c18ff sync 2024-10-14 12:24:10 +02:00
RePixelatedMC
36b99ae4b0 sync 2024-10-13 21:54:37 +02:00
RePixelatedMC
25dbc4dfd6 sync 2024-10-13 21:35:58 +02:00
RePixelatedMC
c35366caa4 mid save 2024-10-11 20:21:30 +02:00
Julian Krings
76365e7875 woops 2024-10-09 13:01:31 +02:00
RePixelatedMC
57649a9ec5 sync 2024-10-09 12:57:49 +02:00
Julian Krings
03582751c5 improve CraftWorldInfo creation 2024-10-09 12:24:52 +02:00
RePixelatedMC
13369bbf32 Merge remote-tracking branch 'origin/v3.4.3' into v3.4.3 2024-10-08 13:42:39 +02:00
Julian Krings
f3b1109804 improve error handling 2024-10-07 20:46:00 +02:00
RePixelatedMC
7f530a4b32 sync 2024-10-07 20:21:14 +02:00
Julian Krings
eda44a8ace fix memory worlds 2024-10-07 16:58:59 +02:00
Julian Krings
f6a354b890 fix missing ArrayType and add tabcompletion to vanilla loot tables 2024-10-06 18:27:48 +02:00
RePixelatedMC
db14861b40 mid save 2024-10-05 20:41:29 +02:00
Julian Krings
457b691add whops 2024-10-04 15:03:09 +02:00
Brian Fopiano
d651f204f8
Merge pull request #1117 from hUwUtao/master 
make javadoc buildable...
 2024-10-02 00:43:56 -04:00
Julian Krings
a61787ecfe woops 2024-10-01 19:31:31 +02:00
Julian Krings
093d77bf8a implement MemoryWorlds 2024-10-01 19:29:29 +02:00
RePixelatedMC
0101130d7a Weee 2024-09-30 20:21:01 +02:00
RePixelatedMC
a3b2a17e2d Merge remote-tracking branch 'mcwg/v3.4.3' into v3.4.3 2024-09-30 08:19:46 +02:00
RePixelatedMC
ff0a68c4f6 Mid changes - SYNC 2024-09-30 08:19:00 +02:00
Julian Krings
e0034dd718 implement vanilla loottables 2024-09-29 20:44:49 +02:00
RePixelatedMC
7c6df58c15 Saving chunks still is a problem though 2024-09-29 19:00:52 +02:00
RePixelatedMC
5d5c5ba9f4 Oh well 2024-09-28 18:43:05 +02:00
RePixelatedMC
85aefcd206 mid save 2024-09-28 18:03:07 +02:00