9
0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-12-30 20:39:21 +00:00
Commit Graph

358 Commits

Author SHA1 Message Date
Julian Krings
b65b112220 Merge branch 'refs/heads/v3.4.3' into iris4
# Conflicts:
#	build.gradle
#	core/src/main/java/com/volmit/iris/core/commands/CommandDeveloper.java
#	core/src/main/java/com/volmit/iris/core/pregenerator/methods/AsyncPregenMethod.java
#	core/src/main/java/com/volmit/iris/core/service/WandSVC.java
#	core/src/main/java/com/volmit/iris/core/tools/IrisConverter.java
#	core/src/main/java/com/volmit/iris/engine/framework/Engine.java
2024-09-06 23:32:21 +02:00
Julian Krings
0a256eaa4c remote/cloud pregen! 2024-09-06 23:21:08 +02:00
Julian Krings
79341bf562 update adventure api 2024-08-28 14:17:54 +02:00
Julian Krings
66a1739666 v+ 2024-08-25 22:16:40 +02:00
Julian Krings
386131ddf0 wait for all loaded chunks to be saved 2024-08-22 16:20:16 +02:00
repixelatedmc
3f66634e5f Stash! 2024-08-19 19:35:16 +02:00
Julian Krings
62e98cc371 Merge branch 'master' into iris4
# Conflicts:
#	build.gradle
#	core/src/main/java/com/volmit/iris/core/nms/INMS.java
#	core/src/main/java/com/volmit/iris/engine/IrisEngine.java
2024-08-17 01:03:17 +02:00
Brian Neumann-Fopiano
c3ac41f894 V+
lol
2024-08-15 12:58:01 -04: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
ec1187923b Gradle Update 2024-08-07 20:01:32 -04:00
Brian Neumann-Fopiano
ab04a686e9 The Great Copyright Number 3 2024-08-07 19:47:23 -04:00
repixelatedmc
8ad3cdf820 - Decos dont float anymore
- Decos dont go over fluidheight anymore
2024-08-07 11:22:55 +02:00
Brian Neumann-Fopiano
79d6f34879 v+ 2024-08-03 14:42:07 -04:00
RePixelatedMC
9d8be5b382 did nextdoors work 2024-08-03 17:18:24 +02:00
Julian Krings
e6f829db31 Merge remote-tracking branch 'origin/master' into iris4 2024-08-03 13:31:09 +02:00
RePixelatedMC
1477dc037c changes i guess 2024-08-02 17:29:39 +02:00
Brian Neumann-Fopiano
cf4796bd12 V+ 2024-07-31 18:45:13 -04:00
Julian Krings
bd89d8a308 change version to show 1.21 compat 2024-08-01 00:20:30 +02:00
Julian Krings
df2186d70f Merge pull request #1110 from VolmitSoftware/v1_21
1.21 Support
2024-07-31 23:52:10 +02:00
Julian Krings
ec9a000bcf Merge remote-tracking branch 'origin/master' into iris4 2024-07-30 12:57:34 +02:00
Julian Krings
f9638e830f update NMSTools 2024-07-30 12:56:27 +02:00
RePixelatedMC
0445b6fe6e Merge branch 'iris4' of https://github.com/VolmitSoftware/Iris into mca 2024-07-29 20:41:25 +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
36d58f29ab Merge pull request #1108 from VolmitSoftware/better_nms
Better NMS
2024-07-23 15:43:21 -04:00
Julian Krings
6ff74639b5 use custom nms gradle plugin 2024-07-18 17:17:05 +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
6c3f3dc889 update oraxen api 2024-06-24 13:17:11 +02:00
Brian Neumann-Fopiano
acccbb028f V+ 2024-06-18 21:32:35 -04:00
Brian Neumann-Fopiano
ced77ec70d V+ 2024-06-09 17:26:08 -04:00
Brian Fopiano
db3bc74364 Merge pull request #1092 from VolmitDev/fix_jigsaw
Jigsaw fixes
2024-05-19 18:21:11 -04:00
CrazyDev22
6ddb0b5304 update gson library 2024-05-16 13:12:11 +02:00
CrazyDev22
f92234297e add 1.20.6 support 2024-05-15 18:07:12 +02:00
Brian Neumann-Fopiano
a3dcf031c9 v+ , and the other v+ lol 2024-04-29 15:45:41 -04:00
RePixelatedMC
2555cd23a0 Merge branch 'VolmitSoftware:master' into 3.2.6 2024-04-19 15:17:21 +02:00
RePixelatedMC
5a4a86aeba - Iris Updater
Updates chunks thats it/
2024-04-19 10:14:16 +02:00
Brian Neumann-Fopiano
768fa7beb5 v+ 2024-04-19 02:47:02 -04:00
RePixelatedMC
55c58fe896 Merge pull request #1087 from RePixelatedMC/PixelatedDev
Should work
2024-04-16 16:34:12 +02:00
Brian Neumann-Fopiano
9ac4024e4e v+ 2024-04-15 11:43:09 -04:00
RePixelatedMC
b898f73a05 Fixed another potential mem leak
Added the base of smart320height
2024-04-09 17:04:32 +02:00
Brian Neumann-Fopiano
121a463788 v+
Woot
2024-04-03 03:03:32 -04: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
Brian Neumann-Fopiano
04ad02719c d 2024-03-30 18:48:00 -04:00
RePixelatedMC
9612fef2a4 - 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
- Perhaps more?
2024-03-16 12:40:40 +01:00
RePixelatedMC
fb9f8d28f4 - Lib update fixes all the iris titles/actionbars
- Iris .schem Converter
2024-02-21 21:24:35 +01:00
Brian Neumann-Fopiano
d658ec2099 oops 2024-02-04 17:37:00 -05:00
Julian Krings
82640de06b v+ 2024-01-25 14:47:19 +01:00
CrazyDev22
9b89ae7846 reimplement IrisCompat 2023-12-31 19:13:57 +01:00