 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 |
|
|
RePixelatedMC
|
dc3487583d
|
Merge pull request #25 from VolmitSoftware/merge
merge
|
2024-06-05 09:53:26 +02:00 |
|
|
RePixelatedMC
|
e1d73ebcd5
|
Merge branch 'mca' into merge
|
2024-06-05 09:53:13 +02:00 |
|
|
RePixelatedMC
|
76f7d46b22
|
e
|
2024-06-01 16:26:21 +02:00 |
|
|
RePixelatedMC
|
cfc52ed909
|
Tuning + Fixed server distro reading for 1.20.6+
|
2024-06-01 16:21:57 +02:00 |
|
|
RePixelatedMC
|
cee94d40e1
|
Merge branch 'master' of https://github.com/VolmitSoftware/Iris
|
2024-05-29 10:18:04 +02:00 |
|
|
RePixelatedMC
|
cad7166cbe
|
Merge pull request #24 from VolmitDev/fix_jigsaw
minor changes to jigsaw
|
2024-05-25 15:41:05 +02:00 |
|
|
RePixelatedMC
|
57efcab0b5
|
tall_seagrass isnt sticking out of water anymore
|
2024-05-22 16:55:07 +02:00 |
|
|
RePixelatedMC
|
b1ab2b84f8
|
Fixed /iris region going of a chunk instead of x,z coords
Added fast edit commands
- /iris std edit biome is now supported and opens the vscode biome of where you are standing at same with region.
|
2024-05-22 15:34:45 +02:00 |
|
|
RePixelatedMC
|
02601e5ee4
|
Cleanup
|
2024-05-22 13:32:29 +02:00 |
|
|
RePixelatedMC
|
070479acf3
|
Merge branch 'mca' of https://github.com/RePixelatedMC/Iris into PixelatedDev
|
2024-05-22 13:29:16 +02:00 |
|
|
RePixelatedMC
|
6b2ba74237
|
Iris lets the user ingame know when unstable.
|
2024-05-22 13:28:56 +02:00 |
|
|
RePixelatedMC
|
619de29710
|
Merge pull request #23 from VolmitDev/mca
improve iris world protection
|
2024-05-21 16:39:21 +02:00 |
|
|
RePixelatedMC
|
bef4c0497f
|
Merge branch 'mca' of https://github.com/RePixelatedMC/Iris into PixelatedDev
|
2024-05-21 11:57:03 +02:00 |
|
|
RePixelatedMC
|
9193497d36
|
Merge pull request #22 from RePixelatedMC/v3.3
V3.3 x MCA?
|
2024-05-21 11:56:14 +02:00 |
|
|
RePixelatedMC
|
81c40ce228
|
Merge branch 'master' of https://github.com/RePixelatedMC/Iris into PixelatedDev
|
2024-05-21 11:23:52 +02:00 |
|
|
RePixelatedMC
|
6ba1d571f2
|
Fallback type when mm not on server
|
2024-05-21 11:23:24 +02:00 |
|
|
RePixelatedMC
|
b0663f9b6c
|
Merge branch 'master' into PixelatedDev
|
2024-05-21 11:22:39 +02:00 |
|
|
RePixelatedMC
|
3146d61efe
|
Merge pull request #19 from VolmitDev/mca
Sync
|
2024-05-20 14:04:32 +02:00 |
|
|
RePixelatedMC
|
1749fcf6b5
|
Merge pull request #18 from VolmitDev/mca
1.20.4 Headless
|
2024-05-17 16:04:43 +02:00 |
|
|
RePixelatedMC
|
4576b95814
|
Fixed width offset with /iris std map when dragging
|
2024-05-16 17:32:32 +02:00 |
|
|
RePixelatedMC
|
e113fa6a61
|
Merge branch 'mca' of https://github.com/RePixelatedMC/Iris into PixelatedDev
|
2024-05-16 16:55:51 +02:00 |
|
|
RePixelatedMC
|
07228afbff
|
Noise benchmark reworkings
|
2024-05-16 16:55:14 +02:00 |
|
|
RePixelatedMC
|
afdffc2453
|
Merge pull request #17 from VolmitDev/fix_jigsaw
Sync jigsaw
|
2024-05-16 13:41:35 +02:00 |
|
|
RePixelatedMC
|
6a5bcd5990
|
Merge pull request #16 from VolmitDev/fix_jigsaw
sync Jigsaw
|
2024-05-15 17:40:29 +02:00 |
|
|
RePixelatedMC
|
1fe6d9a636
|
Merge branch 'mca' of https://github.com/RePixelatedMC/Iris into PixelatedDev
# Conflicts:
# core/src/main/java/com/volmit/iris/core/tools/IrisWorldDump.java
|
2024-05-15 09:29:48 +02:00 |
|
|
RePixelatedMC
|
fec587edad
|
Update README.md
|
2024-05-07 22:42:28 +02:00 |
|
|
RePixelatedMC
|
712937d661
|
Merge pull request #15 from VolmitDev/ecoitems
add Ecoitems support
|
2024-05-04 16:03:08 +02:00 |
|
|
RePixelatedMC
|
1e5aa6e8b0
|
Merge branch 'mca' of https://github.com/RePixelatedMC/Iris into PixelatedDev
|
2024-05-04 11:26:47 +02:00 |
|
|
RePixelatedMC
|
441b27f8f4
|
Merge branch 'VolmitSoftware:master' into mca
|
2024-05-04 11:26:23 +02:00 |
|
|
RePixelatedMC
|
3f3bf70212
|
Merge pull request #14 from VolmitDev/mca
Per World Dimension Types + better Datapack reload
|
2024-05-04 11:26:05 +02:00 |
|
|
RePixelatedMC
|
a12eddbedf
|
sync
|
2024-05-04 11:25:17 +02:00 |
|
|
RePixelatedMC
|
a70258d69f
|
Merge branch 'fix_jigsaw' of https://github.com/VolmitDev/Iris into PixelatedDev
|
2024-05-01 18:55:02 +02:00 |
|
|
RePixelatedMC
|
468e7ef018
|
Merge pull request #1094 from RePixelatedMC/master
Update README.md
|
2024-04-27 12:42:50 +02:00 |
|
|
RePixelatedMC
|
e3e4ecbc5c
|
Update README.md
|
2024-04-27 12:41:29 +02:00 |
|
|
RePixelatedMC
|
304b01d0cf
|
Merge pull request #13 from VolmitDev/mca
add hotload
|
2024-04-27 10:54:38 +02:00 |
|
|
RePixelatedMC
|
e7c9cad7f6
|
Merge pull request #1093 from RePixelatedMC/3.2.5
3.2.5
|
2024-04-26 18:06:37 +02:00 |
|
|
RePixelatedMC
|
71a62b9c73
|
Merge pull request #12 from VolmitDev/mca
fix NMSBindings
|
2024-04-24 17:58:44 +02:00 |
|
|
RePixelatedMC
|
2555cd23a0
|
Merge branch 'VolmitSoftware:master' into 3.2.6
|
2024-04-19 15:17:21 +02:00 |
|
|
RePixelatedMC
|
484fbeca7b
|
Merge branch '3.2.6' of https://github.com/RePixelatedMC/Iris into PixelatedDev
# Conflicts:
# core/src/main/java/com/volmit/iris/core/commands/CommandIris.java
# core/src/main/java/com/volmit/iris/core/safeguard/ServerBootSFG.java
|
2024-04-19 15:16:46 +02:00 |
|
|
RePixelatedMC
|
9a45e0df10
|
/iris support report ( gives server info )
and cleaned the main splash screen and fixed /iris import saying its loaded successfully even if it didnt
|
2024-04-19 15:15:08 +02:00 |
|
|
RePixelatedMC
|
9175296fc6
|
rev2.0
|
2024-04-19 12:43:57 +02:00 |
|
|
RePixelatedMC
|
5a4a86aeba
|
- Iris Updater
Updates chunks thats it/
|
2024-04-19 10:14:16 +02:00 |
|
|
RePixelatedMC
|
55c58fe896
|
Merge pull request #1087 from RePixelatedMC/PixelatedDev
Should work
|
2024-04-16 16:34:12 +02:00 |
|
|
RePixelatedMC
|
72949e0950
|
Update IrisSettings.java
|
2024-04-16 16:32:52 +02:00 |
|
|
RePixelatedMC
|
7fb2a51a33
|
sync
|
2024-04-12 17:08:13 +02:00 |
|
|
RePixelatedMC
|
83a0a7dd54
|
sync laptop
|
2024-04-06 17:06:06 +02:00 |
|
|
RePixelatedMC
|
63b8a935ae
|
sync laptop
|
2024-04-05 18:43:30 +02:00 |
|
|
RePixelatedMC
|
701bfe4a54
|
Merge pull request #10 from CrazyDev05/Pixeldev
Fix lastUse and Implement MultiBurst
|
2023-12-25 14:14:16 +01:00 |
|
|
RePixelatedMC
|
f2370ad814
|
Merge pull request #9 from CrazyDev05/Pixeldev
Sync with Master
|
2023-12-24 15:03:24 +01:00 |
|
|
RePixelatedMC
|
39f59e023c
|
Merge pull request #7 from CrazyDev05/Pixeldev
implement showing location instead of teleporting
|
2023-12-22 21:36:42 +01:00 |
|
|
RePixelatedMC
|
33b926d547
|
Merge pull request #6 from CrazyDev05/Pixeldev
Fixes!
|
2023-12-22 19:54:54 +01:00 |
|
|
RePixelatedMC
|
bb4ad08cc5
|
Merge pull request #5 from CrazyDev05/Pixeldev
More Improvements
|
2023-12-22 16:39:30 +01:00 |
|
|
RePixelatedMC
|
930dc2fd1c
|
Merge pull request #4 from CrazyDev05/Pixeldev
increase unload speed
|
2023-12-22 11:48:23 +01:00 |
|
|
RePixelatedMC
|
bfdb71ca91
|
Merge pull request #3 from CrazyDev05/Pixeldev
TectonicPlate unloading improvements
|
2023-12-22 08:35:35 +01:00 |
|
|
RePixelatedMC
|
a27f37945d
|
Merge branch 'VolmitSoftware:master' into Pixeldev
|
2023-11-24 14:26:06 +01:00 |
|
|
RePixelatedMC
|
f544455708
|
Merge branch 'VolmitSoftware:master' into Pixeldev
|
2023-11-15 16:38:43 +01:00 |
|
|
RePixelatedMC
|
b449938730
|
Merge branch 'VolmitSoftware:master' into Pixeldev
|
2023-11-15 08:18:39 +01:00 |
|
|
RePixelatedMC
|
19d94489d7
|
Merge pull request #2 from RePixelatedMC/repixelated-DEV
Repixelated dev
|
2023-10-22 10:58:00 +02:00 |
|
|
RePixelatedMC
|
15e6750e11
|
Merge pull request #1
IrisLootEvent
|
2023-09-27 10:31:43 +02:00 |
|
|
RePixelatedMC
|
2a9b0a54d9
|
Merge branch 'VolmitSoftware:master' into master
|
2023-09-25 14:37:08 +02:00 |
|