Commit Graph - Iris

mirrors/Iris

Fork 0

mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-04-03 06:16:19 +00:00

Commit Graph

Select branches

Hide Pull Requests

dev

feat/craft_engine

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

#1227

#1228

#1229

#1230

#1231

#1232

#1234

#1235

#1236

#1238

#1238

#1239

#1239

#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

8dd14c80f0 eh repixelatedmc 2024-08-05 10:53:10 +02:00
61410aea97 iris go brrrr Julian Krings 2024-08-04 16:58:36 +02:00
79d6f34879 v+ 3.4.1-1.19.2-1.21 Brian Neumann-Fopiano 2024-08-03 14:42:07 -04:00
f892eb599c build headless biome cache at creation Julian Krings 2024-08-03 20:14:19 +02:00
86f89bc718 Merge remote-tracking branch 'origin/master' into iris4 Julian Krings 2024-08-03 18:50:38 +02:00
ceb6c15c97 tall_seagrass isnt sticking out of water anymore by RePixelatedMC Julian Krings 2024-08-03 18:45:44 +02:00
5be19c7c3c fix nullpointer with headless Julian Krings 2024-08-03 18:43:21 +02:00
7cf43ad7ab fix world creation Julian Krings 2024-08-03 18:04:37 +02:00
9d8be5b382 did nextdoors work RePixelatedMC 2024-08-03 17:18:24 +02:00
ab30710e2a make PackBenchmark startup show errors Julian Krings 2024-08-03 16:56:17 +02:00
d2ecbc5727 fix datapack dump + change target location Julian Krings 2024-08-03 16:55:39 +02:00
22f9306fa3 eghem RePixelatedMC 2024-08-03 15:52:24 +02:00
ab3397a373 fix pack download command Julian Krings 2024-08-03 15:30:56 +02:00
6b4a19a525 Merge remote-tracking branch 'origin/iris4' into iris4 RePixelatedMC 2024-08-03 15:25:55 +02:00
ad8ff2643b wee RePixelatedMC 2024-08-03 15:25:23 +02:00
e6f829db31 Merge remote-tracking branch 'origin/master' into iris4 Julian Krings 2024-08-03 13:31:09 +02:00
8e9f78e982 fix region zoom Julian Krings 2024-08-03 13:03:50 +02:00
b429448885 e RePixelatedMC 2024-08-03 10:11:55 +02:00
f00e037e26 bug fix + better eta RePixelatedMC 2024-08-03 10:07:03 +02:00
bad3cd27e1 bug fix RePixelatedMC 2024-08-03 09:09:02 +02:00
cad679a808 Fast pregen RePixelatedMC 2024-08-02 23:17:52 +02:00
61bbfee640 Update README.md Julian Krings 2024-08-02 18:20:25 +02:00
488b76d1d2 add dummy datapack + fix world creation Julian Krings 2024-08-02 18:14:41 +02:00
1e22a65329 whopsie RePixelatedMC 2024-08-02 18:09:03 +02:00
1477dc037c changes i guess RePixelatedMC 2024-08-02 17:29:39 +02:00
6174ec04ab changes RePixelatedMC 2024-08-02 16:31:36 +02:00
1cac86252f Refactors RePixelatedMC 2024-08-02 15:05:23 +02:00
773065eb56 Advanced world loading! RePixelatedMC 2024-08-02 14:59:05 +02:00
a8524e43b9 dev shit RePixelatedMC 2024-08-01 13:26:13 +02:00
cf4796bd12 V+ 3.4.0-1.19.2-1.21 Brian Neumann-Fopiano 2024-07-31 18:45:13 -04:00
bd89d8a308 change version to show 1.21 compat Julian Krings 2024-08-01 00:20:30 +02:00
df2186d70f Merge pull request #1110 from VolmitSoftware/v1_21 Julian Krings 2024-07-31 23:52:10 +02:00
0a62e222ee No gui errors anymore! RePixelatedMC 2024-07-30 15:24:26 +02:00
ec9a000bcf Merge remote-tracking branch 'origin/master' into iris4 Julian Krings 2024-07-30 12:57:34 +02:00
f9638e830f update NMSTools Julian Krings 2024-07-30 12:56:27 +02:00
0445b6fe6e Merge branch 'iris4' of https://github.com/VolmitSoftware/Iris into mca RePixelatedMC 2024-07-29 20:41:25 +02:00
a0719117ad Iris wont fail loading the rest of the worlds if 1 fails RePixelatedMC 2024-07-29 20:40:01 +02:00
7ae846af6f eghum RePixelatedMC 2024-07-29 20:16:15 +02:00
fe5bb67973 okey back to normal RePixelatedMC 2024-07-29 18:51:07 +02:00
482fa9b11e add missing methods to 1.21 bindings Julian Krings 2024-07-29 18:29:28 +02:00
295fe16f8f Merge remote-tracking branch 'refs/remotes/origin/v1_21' into iris4 Julian Krings 2024-07-29 18:11:11 +02:00
c2ab688590 Merge branch 'mca' of https://github.com/RePixelatedMC/Iris into mca RePixelatedMC 2024-07-29 16:24:42 +02:00
cd55a7fed4 fix getBiomeColor for 1.19.2 Julian Krings 2024-07-27 15:43:09 +02:00
fc890a5ba1 fix missing getBiomeColor method Julian Krings 2024-07-27 15:42:51 +02:00
2ea54b7f2f 1.21 nms bindings Julian Krings 2024-06-20 22:08:12 +02:00
e90e3901f5 Merge pull request #1109 from VolmitSoftware/fixes Brian Fopiano 2024-07-23 15:43:33 -04:00
36d58f29ab Merge pull request #1108 from VolmitSoftware/better_nms Brian Fopiano 2024-07-23 15:43:21 -04:00
864c7ae27c Merge pull request #1106 from VolmitDev/custom_data Brian Fopiano 2024-07-23 15:43:04 -04:00
6d104a2d1c fix y-coordinate for getting biome Julian Krings 2024-07-23 20:05:05 +02:00
89e754245d add maxTries to IrisLootTable to prevent crash Julian Krings 2024-07-21 16:00:02 +02:00
4c68d99c6f fix returning black color in biomes without a color override Julian Krings 2024-07-21 15:50:45 +02:00
f8f0a65f0a add debug info to the updater Julian Krings 2024-07-21 15:25:31 +02:00
6ff74639b5 use custom nms gradle plugin Julian Krings 2024-07-18 17:17:05 +02:00
13c61501e6 Merge pull request #27 from CrazyDev05/mca RePixelatedMC 2024-07-09 20:43:44 +02:00
5ad848fc54 Revert "Revert "Merge branch 'mca' into jigsaw_dist"" Julian Krings 2024-07-09 20:24:21 +02:00
af80f882da add slope condition to sear/shore/surface decorators Julian Krings 2024-07-09 16:25:07 +02:00
84ce7372c3 implement dimension zoom options Julian Krings 2024-07-09 16:23:32 +02:00
e31d39c5f7 fix worldedit selection not updating Julian Krings 2024-07-09 16:19:56 +02:00
2296c1368b fix WorldEditLink Julian Krings 2024-07-09 16:19:22 +02:00
f6cf0682ed Merge branch 'mca' of https://github.com/RePixelatedMC/Iris into mca RePixelatedMC 2024-07-06 13:50:31 +02:00
21d7d96dbc Merge pull request #1107 from RePixelatedMC/master Brian Fopiano 2024-07-05 00:46:54 -04:00
956e511fe0 Merge remote-tracking branch 'origin/master' RePixelatedMC 2024-07-04 22:02:42 +02:00
e427887f8c Scary RePixelatedMC 2024-07-04 22:00:50 +02:00
88ea43fbbe fix post processing for custom blocks not applying to objects Julian Krings 2024-06-28 18:14:52 +02:00
29526a80a9 improve custom block/item api to allow custom settings Julian Krings 2024-06-25 13:35:34 +02:00
48f901fc8c handle null pointer Julian Krings 2024-06-25 13:33:44 +02:00
6c3f3dc889 update oraxen api Julian Krings 2024-06-24 13:17:11 +02:00
743410d3ee add nms method to get biome color Julian Krings 2024-06-24 13:16:56 +02:00
acccbb028f V+ Brian Neumann-Fopiano 2024-06-18 21:32:35 -04:00
8b31fdc780 Merge pull request #1105 from VolmitDev/jigsaw_dist Julian Krings 2024-06-17 17:07:47 +02:00
55017b9ac2 Revert "Merge branch 'mca' into jigsaw_dist" CrazyDev22 2024-06-16 14:25:47 +02:00
0288d35c85 Merge branch 'mca' into jigsaw_dist Julian Krings 2024-06-16 14:23:49 +02:00
8b3577dd0b make divisor used for generating missing jigsaw placement values changeable Julian Krings 2024-06-16 14:06:24 +02:00
ced77ec70d V+ Brian Neumann-Fopiano 2024-06-09 17:26:08 -04:00
e1e90f5c8a add toolchain resolver 3.3.0-1.19.2-1.20.6 Julian Krings 2024-06-08 08:27:17 +02:00
3cb74ac922 Merge branch 'mca' of https://github.com/RePixelatedMC/Iris into mca RePixelatedMC 2024-06-05 09:53:46 +02:00
dc3487583d Merge pull request #25 from VolmitSoftware/merge RePixelatedMC 2024-06-05 09:53:26 +02:00
e1d73ebcd5 Merge branch 'mca' into merge RePixelatedMC 2024-06-05 09:53:13 +02:00
dae3de8982 1.20.6 compat RePixelatedMC 2024-06-05 09:48:27 +02:00
d7cf3b9500 no gui for now RePixelatedMC 2024-06-03 10:03:14 +02:00
8ce4e3c6b2 Merge pull request #1104 from RePixelatedMC/master Brian Fopiano 2024-06-01 10:30:21 -04:00
76f7d46b22 e RePixelatedMC 2024-06-01 16:26:21 +02:00
cfc52ed909 Tuning + Fixed server distro reading for 1.20.6+ RePixelatedMC 2024-06-01 16:21:57 +02:00
cee94d40e1 Merge branch 'master' of https://github.com/VolmitSoftware/Iris RePixelatedMC 2024-05-29 10:18:04 +02:00
cad7166cbe Merge pull request #24 from VolmitDev/fix_jigsaw RePixelatedMC 2024-05-25 15:41:05 +02:00
c05fdbd0ec Merge pull request #1103 from VolmitDev/fix_jigsaw Julian Krings 2024-05-25 15:39:07 +02:00
c9b26ebaff add better backwards compat CrazyDev22 2024-05-25 15:34:51 +02:00
bee1973390 fix salt not being a long CrazyDev22 2024-05-25 15:34:25 +02:00
57efcab0b5 tall_seagrass isnt sticking out of water anymore RePixelatedMC 2024-05-22 16:55:07 +02:00
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. RePixelatedMC 2024-05-22 15:34:45 +02:00
02601e5ee4 Cleanup RePixelatedMC 2024-05-22 13:32:29 +02:00
070479acf3 Merge branch 'mca' of https://github.com/RePixelatedMC/Iris into PixelatedDev RePixelatedMC 2024-05-22 13:29:16 +02:00
6b2ba74237 Iris lets the user ingame know when unstable. RePixelatedMC 2024-05-22 13:28:56 +02:00
619de29710 Merge pull request #23 from VolmitDev/mca RePixelatedMC 2024-05-21 16:39:21 +02:00
12556fa98f improve iris world protection CrazyDev22 2024-05-21 16:38:28 +02:00
bef4c0497f Merge branch 'mca' of https://github.com/RePixelatedMC/Iris into PixelatedDev RePixelatedMC 2024-05-21 11:57:03 +02:00
9193497d36 Merge pull request #22 from RePixelatedMC/v3.3 RePixelatedMC 2024-05-21 11:56:14 +02:00
ca6affbde9 Merge branch 'master' into v3.3 RePixelatedMC 2024-05-21 11:48:39 +02:00
81c40ce228 Merge branch 'master' of https://github.com/RePixelatedMC/Iris into PixelatedDev RePixelatedMC 2024-05-21 11:23:52 +02:00
6ba1d571f2 Fallback type when mm not on server RePixelatedMC 2024-05-21 11:23:24 +02:00