mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-19 10:43:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,673 Commits 18 Branches 104 Tags
Commit Graph

3673 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
RePixelatedMC
02c7ab71d4 Merge remote-tracking branch 'PixelsV3/PixelatedDev' into PixelatedDev 
# Conflicts:
#	core/src/main/java/com/volmit/iris/core/pregenerator/TurboPregenerator.java
 2023-12-30 14:31:22 +01:00
RePixelatedMC
8ec1ac9875 sync 2023-12-30 14:29:31 +01:00
RePixelatedMC
e03027a386 Now using klist for tounload 2023-12-30 14:15:59 +01:00
Julian Krings
387cf566c9
Merge branch 'VolmitSoftware:master' into jigsaw_placement_fix 2023-12-30 11:25:33 +01:00
Brian Fopiano
dff7665934
Merge pull request #1053 from RePixelatedMC/Pixeldev 
Pixeldev
 2023-12-29 16:32:21 -05:00
RePixelatedMC
9421d788f3 Backup 2023-12-28 17:56:30 +01:00
RePixelatedMC
d960574b24 Ah yes 2023-12-28 14:41:16 +01:00
RePixelatedMC
e8671cbbf0 whoop 2023-12-27 09:13:14 +01:00
RePixelatedMC
cbf8039eea Cleanup p2 2023-12-27 09:09:11 +01:00
RePixelatedMC
d7415e3711 Merged CommandWorldManager.java into CommandIris.java 2023-12-27 09:05:05 +01:00
RePixelatedMC
26e71ee6b5 small tweak 2023-12-27 08:06:40 +01:00
RePixelatedMC
f8c42b3e48 cleaning up 2023-12-27 07:35:24 +01:00
RePixelatedMC
886bed9634 o 2023-12-26 13:38:31 +01:00
RePixelatedMC
7b7023fc99 Added ToUpgradedVersion 2023-12-26 13:32:37 +01:00
RePixelatedMC
701bfe4a54
Merge pull request #10 from CrazyDev05/Pixeldev 
Fix lastUse and Implement MultiBurst
 2023-12-25 14:14:16 +01:00
CrazyDev22
290d7a93ab switch to burst 2023-12-25 13:53:45 +01:00
CrazyDev22
729bcc7ba0 fix lastUse 2023-12-25 13:52:31 +01:00
RePixelatedMC
e46b68e2f3 comment 2023-12-24 16:41:20 +01:00
RePixelatedMC
cdf73c4629 Nvmr 2023-12-24 16:40:44 +01:00
RePixelatedMC
2f0dd2d172 Quick fix 2023-12-24 16:17:41 +01:00
RePixelatedMC
7e5704bf80 No idea why crazy recommended this 2023-12-24 15:17:56 +01:00
RePixelatedMC
ef96fb9a0e Removed debug code 2023-12-24 15:06:53 +01:00
RePixelatedMC
f2370ad814
Merge pull request #9 from CrazyDev05/Pixeldev 
Sync with Master
 2023-12-24 15:03:24 +01:00
RePixelatedMC
0783620104 Way to tired 2023-12-24 15:00:02 +01:00
RePixelatedMC
2193b02c0a Removed debug code 2023-12-24 14:40:41 +01:00
RePixelatedMC
aef05bad20 Deleted leftovers and a couple of changes 2023-12-24 14:32:13 +01:00
CrazyDev22
e002ab6378 disable 1.20.4 nms bindings for now 2023-12-23 21:17:35 +01:00
Julian Krings
a2c2b4a2d4
Sync with Master 2023-12-23 20:53:33 +01:00
Julian Krings
3ae896457b
Merge branch 'Pixeldev' into origin 2023-12-23 20:53:18 +01:00
Julian Krings
683a90ed09
Merge branch 'VolmitSoftware:master' into jigsaw_placement_fix 2023-12-23 20:52:13 +01:00
Brian Fopiano
5685e25234
Merge pull request #1061 from CrazyDev05/build_fix 
fix missing dependency
 2023-12-23 14:43:07 -05:00
CrazyDev22
6edf083e7b fix <world>/iris/iris/pack path 2023-12-23 20:39:54 +01:00
CrazyDev22
995d1495eb fix missing dependency 2023-12-23 20:14:43 +01:00
Julian Krings
d5f74631cd
Merge branch 'VolmitSoftware:master' into jigsaw_placement_fix 2023-12-23 18:37:59 +01:00
Brian Fopiano
dd5b9b2e81
Merge pull request #1060 from CrazyDev05/build_fix 
Build fix
 2023-12-23 12:32:09 -05:00
RePixelatedMC
ca78200c1c Deleted leftovers 2023-12-23 15:01:27 +01:00
RePixelatedMC
d73c2a65ae - Saving iris and mc version data to engine 2023-12-23 14:57:33 +01:00
CrazyDev22
0ee2cb8e3c why did I add that 2023-12-23 11:47:26 +01:00
CrazyDev22
5ba429ec73 implement getBiomes method 2023-12-23 11:40:06 +01:00
CrazyDev22
709825d073 decrease build time to ~30s 
revert single version building
 2023-12-23 11:39:40 +01:00
Julian Krings
3fe73af5e8
Merge branch 'VolmitSoftware:master' into jigsaw_placement_fix 2023-12-23 10:20:30 +01:00
Brian Fopiano
ccc0b0dd7d
Merge pull request #1057 from CrazyDev05/single_nms 
add ability to only compile for one mc version
 2023-12-22 20:03:58 -05:00
Brian Fopiano
1114ede267
Merge pull request #1058 from IkyMax/master 
Update to 1.20.4
 2023-12-22 20:03:37 -05:00
Brian Fopiano
5546f12499
Merge pull request #1052 from CrazyDev05/worldedit_fix 
Worldedit fix
 2023-12-22 20:03:24 -05:00
Brian Fopiano
4f38acb592
Merge pull request #1055 from CrazyDev05/multiversion_fix 
NoSuchFieldError: CHERRY_GROVE fix
 2023-12-22 20:03:11 -05:00
RePixelatedMC
39f59e023c
Merge pull request #7 from CrazyDev05/Pixeldev 
implement showing location instead of teleporting
 2023-12-22 21:36:42 +01:00
CrazyDev22
5ed5322fce implement showing location instead of teleporting 2023-12-22 21:23:01 +01:00
RePixelatedMC
33b926d547
Merge pull request #6 from CrazyDev05/Pixeldev 
Fixes!
 2023-12-22 19:54:54 +01:00
CrazyDev22
af8778c6cd fix ArrayIndexOutOfBoundsException 
fix NullPointerException
fix ConcurrentModificationException x2
 2023-12-22 19:36:07 +01:00
RePixelatedMC
bb4ad08cc5
Merge pull request #5 from CrazyDev05/Pixeldev 
More Improvements
 2023-12-22 16:39:30 +01:00