Commit Graph - Iris

mirrors/Iris

Fork 0

mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-05-19 08:00:18 +00:00

Commit Graph

Select branches

Hide Pull Requests

dev

feat/exclusions-map

feat/folia

feat/headless

feat/map

feat/mob_spawning_v2

feat/static_placements

fix/deco-fixes

master

old/iris3

old/iris4

old/v3.4.3-dev

unification

#1

#1000

#1002

#1003

#1010

#1022

#1026

#1033

#1034

#1036

#1037

#1038

#1040

#1041

#1042

#1043

#1044

#1045

#1046

#1047

#1049

#1050

#1051

#1052

#1053

#1055

#1056

#1057

#1058

#1059

#1060

#1061

#1062

#1063

#1064

#1065

#1066

#1067

#1069

#1071

#1073

#1074

#1075

#1076

#1077

#1078

#1079

#1080

#1081

#1082

#1083

#1084

#1085

#1087

#1088

#1090

#1091

#1092

#1093

#1094

#1095

#1096

#1097

#1099

#1100

#1101

#1102

#1103

#1104

#1105

#1106

#1107

#1108

#1109

#1110

#1111

#1112

#1113

#1114

#1115

#1117

#1121

#1128

#1129

#1130

#1131

#1132

#1133

#1134

#1135

#1137

#1138

#1139

#1140

#1142

#1143

#1144

#1145

#1149

#1150

#1151

#1152

#1153

#1154

#1155

#1156

#1158

#1159

#1164

#1165

#1166

#1167

#1168

#1169

#1170

#1171

#1172

#1174

#1175

#1176

#1177

#1178

#1179

#1180

#1181

#1182

#1183

#1184

#1186

#1187

#1188

#1189

#1190

#1191

#1192

#1193

#1194

#1195

#1196

#1197

#1198

#1199

#1200

#1201

#1202

#1203

#1204

#1205

#1206

#1206

#1207

#1209

#1210

#1211

#1212

#1213

#1214

#1215

#1217

#1217

#1218

#1219

#1221

#1222

#1223

#1224

#1225

#1226

#1227

#1228

#1229

#1230

#1231

#1232

#1234

#1235

#1236

#1238

#1239

#1239

#1241

#1241

#1242

#13

#14

#15

#16

#17

#18

#19

#327

#349

#350

#354

#357

#358

#360

#361

#363

#365

#366

#369

#370

#371

#374

#375

#376

#378

#385

#390

#391

#392

#393

#394

#396

#398

#399

#401

#406

#408

#410

#411

#413

#414

#415

#418

#419

#423

#433

#434

#435

#436

#437

#442

#443

#448

#454

#455

#458

#465

#467

#470

#471

#472

#473

#474

#477

#478

#479

#481

#482

#485

#486

#487

#491

#492

#496

#500

#503

#506

#510

#512

#513

#514

#515

#516

#517

#518

#519

#521

#522

#523

#527

#528

#529

#531

#536

#538

#539

#540

#541

#544

#545

#546

#547

#548

#553

#554

#555

#556

#557

#559

#561

#565

#574

#588

#591

#592

#599

#616

#618

#620

#621

#622

#624

#627

#628

#630

#633

#634

#636

#638

#643

#644

#645

#649

#650

#651

#652

#653

#656

#657

#659

#661

#663

#664

#667

#668

#669

#671

#672

#679

#685

#687

#688

#689

#693

#695

#698

#699

#700

#703

#704

#713

#716

#720

#722

#723

#724

#725

#726

#727

#735

#736

#737

#743

#744

#747

#747

#748

#748

#750

#752

#756

#757

#761

#763

#764

#768

#769

#777

#778

#780

#782

#785

#786

#788

#789

#793

#794

#795

#796

#798

#800

#810

#819

#821

#826

#827

#828

#829

#830

#832

#837

#838

#840

#843

#845

#847

#849

#856

#863

#872

#876

#879

#883

#887

#889

#890

#893

#894

#899

#907

#908

#909

#910

#911

#913

#915

#916

#920

#926

#933

#938

#941

#943

#944

#951

#952

#953

#954

#960

#961

#962

#963

#966

#967

#973

#974

#975

#982

#986

#988

#989

#990

#994

#995

1.0

1.3.2

1.3.3

2.0.1-1.18.X

2.0.2-1.18.X

2.0.3-1.18.2

2.0.4-1.18.2

2.0.5-1.18.2

2.0.6-1.18.2

2.0.7-1.18.2

2.1.0-1.18.2

2.1.1-1.18.2

2.1.2-1.18.2

2.1.3-1.18.2

2.2.0-1.19

2.2.1-1.19

2.2.10-1.19.2

2.2.11-1.19.2

2.2.12-1.19.2

2.2.13-1.19.2

2.2.14-1.19.2

2.2.15-1.19.2

2.2.16-1.19-2

2.2.16-1.19.2

2.2.17-1.19.2

2.2.18-1.19.2

2.2.19-1.19.2

2.2.2-1.19

2.2.21-1.19.2

2.2.3-1.19

2.2.4-1.19

2.2.5-1.19

2.2.6-1.19.1

2.2.7-1.19.1

2.2.8-1.19.2

2.2.9-1.19.2

2.3.0-1.19.2

2.3.1-1.19.2

2.3.10-1.19.3

2.3.11-1.19.3

2.3.12-1.19.3

2.3.13-1.19.3

2.3.14-1.19.3

2.3.2-1.19.2

2.3.3-1.19.2

2.3.4-1.19.2

2.3.5-1.19.2

2.3.6-1.19.2

2.3.7-1.19.2

2.3.8-1.19.2

2.3.9-1.19.2

2.4.1-1.19.3

2.4.2-1.19.3

2.4.3-1.19.3

2.5.0-1.19.4

2.5.1-.19.4

2.5.1-1.19.4

2.5.1-1.9.4

2.6.0-1.19.4

2.6.1-1.19.4

2.6.2-1.19.4

2.7.0-1.20.0

2.7.1-1.20.1

2.7.2-1.20.1

2.7.3-1.20.1

2.7.4-1.20.1

2.7.5-1.20.1

2.7.6-1.20.1

2.7.7-1.20.1

2.8.0-1.20.1

2.8.1-1.20.1

3.0.0-1.19.2-1.20.2

3.2.0-1.19.2-1.20.4

3.2.2-1.19.2-1.20.4

3.2.3-1.19.2-1.20.4

3.2.4-.19.2-1.20.4

3.2.6-1.19.2-1.20.4

3.3.0-1.19.2-1.20.6

3.4.0-1.19.2-1.21

3.4.1-1.19.2-1.21

3.4.2-1.19.2-1.21.1

3.5.0-1.19.2-1.21.3

3.5.1-1.19.2.1.21.3

3.5.2-1.19.2-1.21.3

3.5.3-1.19.2-1.21.3

3.5.4-1.19.2-1.21.3

3.5.5-1.19.2-1.21.3

3.5.6-1.19.2-1.21.3

3.5.7-1.19.2-1.21.4

3.5.8-1.19.2-1.21.4

3.5.9-1.19.2-1.21.4

3.6.0-1.20.1-1.21.4

3.6.1-1.20.1-1.21.4

3.6.10-1.20.1-1.21.5

3.6.11-1.20.1-1.21.5

3.6.2-1.20.1-1.21.4

3.6.3-1.20.1-1.21.4

3.6.4-1.20.1-1.21.4

3.6.5-1.20.1-1.21.4

3.6.6-1.20.1-1.21.4

3.6.7-1.20.1-1.21.4

3.6.8-1.20.1-1.21.4

3.6.9-1.20.1-1.21.5

3.7.0-1.20.1-1.21.7

3.7.1-1.20.1-1.21.8

3.7.10-1.20.1-1.21.8

3.7.11-1.20.1-1.21.8

3.7.2-1.20.1-1.21.8

3.8.0-1.20.1-1.21.10

3.8.1-1.20.1-1.21.10

3.8.2-1.20.1-1.21.10

3.9.0-1.20.1-1.21.11

3.9.1-1.20.1-1.21.11

7d4c9d6c1e Merge pull request #1066 from VolmitDev/better-version-compat Brian Fopiano 2024-01-25 10:51:56 -05:00
e68b1a52ee Merge pull request #1067 from RePixelatedMC/PixelatedDev Brian Fopiano 2024-01-25 10:51:45 -05:00
955e8622b5 Merge remote-tracking branch 'VolmitDev/better-version-compat' into PixelatedDev RePixelatedMC 2024-01-25 14:57:47 +01:00
82640de06b v+ Julian Krings 2024-01-25 14:47:19 +01:00
c93cb19563 - !Fixed pregen skipping chunks - !Improved stacking for partof - improved DeepSearch - Some SFG Fixes - Added some Todos - Improvements to objects being placed in the air - Studio BoardSVC for debug RePixelatedMC 2024-01-25 11:23:38 +01:00
ccb7855d7d Merge branch 'VolmitSoftware:master' into jigsaw_placement_fix Julian Krings 2024-01-20 15:10:05 +01:00
bad547356c Disabled for now RePixelatedMC 2024-01-14 16:43:39 +01:00
1740bb0021 whoop RePixelatedMC 2024-01-14 16:35:00 +01:00
20f05bf317 whoop RePixelatedMC 2024-01-14 16:32:15 +01:00
669ede5482 remove turbo for now RePixelatedMC 2024-01-14 10:18:41 +01:00
ab658f58f9 Merge branch 'VolmitSoftware:master' into better-version-compat Julian Krings 2024-01-13 10:52:50 +01:00
1b3916749a Merge pull request #1063 from RePixelatedMC/PixelatedDev Brian Fopiano 2024-01-12 10:38:06 -05:00
e29ec657d3 e RePixelatedMC 2024-01-12 16:10:02 +01:00
04f3a226a1 whoop RePixelatedMC 2024-01-12 16:07:02 +01:00
099d1cc362 - Added DeepSearchPregenerator.java < although not finished the base is functional > - Fixes! - Dynmap SFG detection now works! RePixelatedMC 2024-01-12 15:56:04 +01:00
c11e9bf704 Merge remote-tracking branch 'origin/master' into PixelatedDev RePixelatedMC 2024-01-11 22:56:48 +01:00
ffa0b984a0 whoop RePixelatedMC 2024-01-10 18:47:14 +01:00
f0f9261ed3 whoop RePixelatedMC 2024-01-04 15:29:23 +01:00
ba433bc244 - Display true height instead of engine height option added! RePixelatedMC 2024-01-04 15:26:25 +01:00
27f8ad982a Merge branch 'VolmitSoftware:master' into jigsaw_placement_fix Julian Krings 2023-12-31 19:15:39 +01:00
9b89ae7846 reimplement IrisCompat CrazyDev22 2023-12-31 19:13:57 +01:00
c11b5342e3 Merge pull request #1062 from RePixelatedMC/master Brian Fopiano 2023-12-30 08:56:53 -05:00
b9c88f5b12 Fixed a rare crash - Crazydev RePixelatedMC 2023-12-30 14:36:07 +01:00
02c7ab71d4 Merge remote-tracking branch 'PixelsV3/PixelatedDev' into PixelatedDev RePixelatedMC 2023-12-30 14:31:22 +01:00
8ec1ac9875 sync RePixelatedMC 2023-12-30 14:29:31 +01:00
e03027a386 Now using klist for tounload RePixelatedMC 2023-12-30 14:15:59 +01:00
387cf566c9 Merge branch 'VolmitSoftware:master' into jigsaw_placement_fix Julian Krings 2023-12-30 11:25:33 +01:00
dff7665934 Merge pull request #1053 from RePixelatedMC/Pixeldev Brian Fopiano 2023-12-29 16:32:21 -05:00
9421d788f3 Backup RePixelatedMC 2023-12-28 17:56:30 +01:00
d960574b24 Ah yes RePixelatedMC 2023-12-28 14:41:16 +01:00
e8671cbbf0 whoop RePixelatedMC 2023-12-27 09:13:14 +01:00
cbf8039eea Cleanup p2 RePixelatedMC 2023-12-27 09:09:11 +01:00
d7415e3711 Merged CommandWorldManager.java into CommandIris.java RePixelatedMC 2023-12-27 09:05:05 +01:00
26e71ee6b5 small tweak RePixelatedMC 2023-12-27 08:06:40 +01:00
f8c42b3e48 cleaning up RePixelatedMC 2023-12-27 07:35:24 +01:00
886bed9634 o RePixelatedMC 2023-12-26 13:38:31 +01:00
7b7023fc99 Added ToUpgradedVersion RePixelatedMC 2023-12-26 13:32:37 +01:00
701bfe4a54 Merge pull request #10 from CrazyDev05/Pixeldev RePixelatedMC 2023-12-25 14:14:16 +01:00
290d7a93ab switch to burst CrazyDev22 2023-12-25 13:53:45 +01:00
729bcc7ba0 fix lastUse CrazyDev22 2023-12-25 13:52:31 +01:00
e46b68e2f3 comment RePixelatedMC 2023-12-24 16:41:20 +01:00
cdf73c4629 Nvmr RePixelatedMC 2023-12-24 16:40:44 +01:00
2f0dd2d172 Quick fix RePixelatedMC 2023-12-24 16:17:41 +01:00
7e5704bf80 No idea why crazy recommended this RePixelatedMC 2023-12-24 15:17:56 +01:00
ef96fb9a0e Removed debug code RePixelatedMC 2023-12-24 15:06:53 +01:00
f2370ad814 Merge pull request #9 from CrazyDev05/Pixeldev RePixelatedMC 2023-12-24 15:03:24 +01:00
0783620104 Way to tired RePixelatedMC 2023-12-24 15:00:02 +01:00
2193b02c0a Removed debug code RePixelatedMC 2023-12-24 14:40:41 +01:00
aef05bad20 Deleted leftovers and a couple of changes RePixelatedMC 2023-12-24 14:32:13 +01:00
e002ab6378 disable 1.20.4 nms bindings for now CrazyDev22 2023-12-23 21:17:35 +01:00
a2c2b4a2d4 Sync with Master Julian Krings 2023-12-23 20:53:33 +01:00
3ae896457b Merge branch 'Pixeldev' into origin Julian Krings 2023-12-23 20:53:18 +01:00
683a90ed09 Merge branch 'VolmitSoftware:master' into jigsaw_placement_fix Julian Krings 2023-12-23 20:52:13 +01:00
5685e25234 Merge pull request #1061 from CrazyDev05/build_fix Brian Fopiano 2023-12-23 14:43:07 -05:00
6edf083e7b fix <world>/iris/iris/pack path CrazyDev22 2023-12-23 20:39:54 +01:00
995d1495eb fix missing dependency CrazyDev22 2023-12-23 20:14:43 +01:00
d5f74631cd Merge branch 'VolmitSoftware:master' into jigsaw_placement_fix Julian Krings 2023-12-23 18:37:59 +01:00
dd5b9b2e81 Merge pull request #1060 from CrazyDev05/build_fix Brian Fopiano 2023-12-23 12:32:09 -05:00
ca78200c1c Deleted leftovers RePixelatedMC 2023-12-23 15:01:27 +01:00
d73c2a65ae - Saving iris and mc version data to engine RePixelatedMC 2023-12-23 14:56:12 +01:00
0ee2cb8e3c why did I add that CrazyDev22 2023-12-23 11:47:26 +01:00
5ba429ec73 implement getBiomes method CrazyDev22 2023-12-23 11:40:06 +01:00
709825d073 decrease build time to ~30s revert single version building CrazyDev22 2023-12-23 11:39:40 +01:00
3fe73af5e8 Merge branch 'VolmitSoftware:master' into jigsaw_placement_fix Julian Krings 2023-12-23 10:20:30 +01:00
ccc0b0dd7d Merge pull request #1057 from CrazyDev05/single_nms Brian Fopiano 2023-12-22 20:03:58 -05:00
1114ede267 Merge pull request #1058 from IkyMax/master Brian Fopiano 2023-12-22 20:03:37 -05:00
5546f12499 Merge pull request #1052 from CrazyDev05/worldedit_fix Brian Fopiano 2023-12-22 20:03:24 -05:00
4f38acb592 Merge pull request #1055 from CrazyDev05/multiversion_fix Brian Fopiano 2023-12-22 20:03:11 -05:00
39f59e023c Merge pull request #7 from CrazyDev05/Pixeldev RePixelatedMC 2023-12-22 21:36:42 +01:00
5ed5322fce implement showing location instead of teleporting CrazyDev22 2023-12-22 21:23:01 +01:00
33b926d547 Merge pull request #6 from CrazyDev05/Pixeldev RePixelatedMC 2023-12-22 19:54:54 +01:00
af8778c6cd fix ArrayIndexOutOfBoundsException fix NullPointerException fix ConcurrentModificationException x2 CrazyDev22 2023-12-22 19:36:07 +01:00
bb4ad08cc5 Merge pull request #5 from CrazyDev05/Pixeldev RePixelatedMC 2023-12-22 16:39:30 +01:00
ee4eb7b3f0 fix CrazyDev22 2023-12-22 16:34:39 +01:00
5bc024a6ee Merge remote-tracking branch 'pixeldev/Pixeldev' into Pixeldev CrazyDev22 2023-12-22 16:33:51 +01:00
0546caeb05 - Fixed Process Threads displaying the incorrect value on startup. RePixelatedMC 2023-12-22 16:24:48 +01:00
a75348d3ee Merge remote-tracking branch 'pixeldev/Pixeldev' into Pixeldev CrazyDev22 2023-12-22 16:19:49 +01:00
3f3f947f43 change the Param description CrazyDev22 2023-12-22 16:17:56 +01:00
5127b7c959 - Added DiskSpace to Splash - Changed form ofSize to contain a space RePixelatedMC 2023-12-22 16:16:48 +01:00
a28df78792 switch to lz4 block compression CrazyDev22 2023-12-22 16:13:57 +01:00
4f888f16bc Add Compression Test Command CrazyDev22 2023-12-22 16:13:46 +01:00
55ed9d7132 - Added DiskSpace check RePixelatedMC 2023-12-22 15:59:05 +01:00
779a56c3a1 add compression test command CrazyDev22 2023-12-22 15:50:27 +01:00
f6440bde07 - Added Sufficient Permission check RePixelatedMC 2023-12-22 15:33:22 +01:00
930dc2fd1c Merge pull request #4 from CrazyDev05/Pixeldev RePixelatedMC 2023-12-22 11:48:23 +01:00
1e96fd529b increase unload speed CrazyDev22 2023-12-22 11:17:55 +01:00
167c865bb2 e RePixelatedMC 2023-12-22 09:00:57 +01:00
4e6b6c11a3 Merge remote-tracking branch 'PixelsV3/Pixeldev' into Pixeldev RePixelatedMC 2023-12-22 08:37:27 +01:00
bfdb71ca91 Merge pull request #3 from CrazyDev05/Pixeldev RePixelatedMC 2023-12-22 08:35:35 +01:00
f590f9824e Update to 1.20.4 IkyMax 2023-12-21 15:58:45 -06:00
b3a087702d show unloaded tectonicplates count CrazyDev22 2023-12-21 22:36:50 +01:00
1a786fb418 give hyperLock a purpose again CrazyDev22 2023-12-21 22:36:05 +01:00
650d38e212 Implement MultiThreading in the TectonicPlates unloader CrazyDev22 2023-12-21 22:30:08 +01:00
130cb7ad93 So that works RePixelatedMC 2023-12-21 22:04:19 +01:00
85e8ffeaa3 Merge remote-tracking branch 'pixeldev/Pixeldev' into Pixeldev CrazyDev22 2023-12-21 20:55:37 +01:00
db40f608fa try this out RePixelatedMC 2023-12-21 15:39:26 +01:00
a7b471682a try this out RePixelatedMC 2023-12-21 15:39:26 +01:00
4595fea7d7 fix NullPointerException CrazyDev22 2023-12-21 12:34:14 +01:00
4580f8d9a4 fix StackOverflowError CrazyDev22 2023-12-21 12:21:20 +01:00
37f76fa133 Dynamically define tectonicLimit and cooldown CrazyDev22 2023-12-20 14:43:37 +01:00

... 10 11 12 13 14 ...