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

Mono Color

• 578070dffe changes RePixelatedMC 2024-11-13 16:58:36 +01:00
• 1f9c72d093 fix compile Julian Krings 2024-11-09 13:57:44 +01:00
• a1495a10e5 updater fixes Julian Krings 2024-11-08 21:01:11 +01:00
• a0d91dbc74 sync and fixes RePixelatedMC 2024-11-05 10:14:32 +01:00
• eb80ae62b1 Fix mem leak and further improvements RePixelatedMC 2024-11-01 20:47:19 +01:00
• 11ae48bea1 revert previous Julian Krings 2024-10-31 21:33:24 +01:00
• b0f4b29a2d ehh Julian Krings 2024-10-31 21:05:07 +01:00
• c38bb1cd01 stability improvements for the chunk updater Julian Krings 2024-10-30 15:59:31 +01:00
• 7faa727bd2 midsave ChunkUpdater improvements Julian Krings 2024-10-29 22:12:22 +01:00
• a8751c80ab Should fix? RePixelatedMC 2024-10-29 20:53:16 +01:00
• fd38f0d127 better RePixelatedMC 2024-10-29 13:36:32 +01:00
• 537b0f8dd6 Should work RePixelatedMC 2024-10-28 15:44:44 +01:00
• 560f2f4fdc lol RePixelatedMC 2024-10-28 15:37:14 +01:00
• 7c725a9436 Slices + Huge performance increase RePixelatedMC 2024-10-28 15:30:51 +01:00
• 6532715490 r RePixelatedMC 2024-10-28 13:30:31 +01:00
• b1bb01665a Stability RePixelatedMC 2024-10-28 11:12:24 +01:00
• 6c69c69868 Merge branch 'v3.4.3' into v3.4.3-dev Julian Krings 2024-10-27 14:06:17 +01:00
• 9cd7ad6770 Merge branch 'v3.4.3-dev' of https://github.com/VolmitSoftware/Iris into v3.4.3 RePixelatedMC 2024-10-23 20:27:41 +02:00
• b70c9fd4d8 deepslate variant support RePixelatedMC 2024-10-23 13:50:24 +02:00
• 412f592e1c removed comment RePixelatedMC 2024-10-22 21:22:01 +02:00
• 6c0fa9361f Merge remote-tracking branch 'origin/v3.4.3' into v3.4.3 RePixelatedMC 2024-10-22 21:20:45 +02:00
• b7dcdd2921 yey RePixelatedMC 2024-10-22 21:20:29 +02:00
• 1d8acd2d62 Merge remote-tracking branch 'origin/v3.4.3' into v3.4.3 RePixelatedMC 2024-10-22 15:29:05 +02:00
• 05bf92ca50 huh RePixelatedMC 2024-10-22 15:28:39 +02:00
• dd598d18bf Merge remote-tracking branch 'origin/v3.4.3' into v3.4.3 RePixelatedMC 2024-10-22 15:24:10 +02:00
• cc6de4a46d oh well back to scratch RePixelatedMC 2024-10-22 15:23:50 +02:00
• 9950551ecb Help RePixelatedMC 2024-10-22 14:13:30 +02:00
• dfd27ecbff sync RePixelatedMC 2024-10-22 10:01:48 +02:00
• ac5d5793ab cleanup 2 RePixelatedMC 2024-10-19 17:42:35 +02:00
• 2133a03c21 cleanup RePixelatedMC 2024-10-19 17:16:29 +02:00
• 8755449c13 Untested but should work though RePixelatedMC 2024-10-18 15:36:09 +02:00
• 9e40259ca2 fix LegacyTileData not placing Julian Krings 2024-10-17 19:18:11 +02:00
• 94a7692735 add force place for stronghold Julian Krings 2024-10-17 18:48:17 +02:00
• 86ce02789e woops Julian Krings 2024-10-17 17:49:23 +02:00
• 773c8129c9 cleanup and improve merger Julian Krings 2024-10-17 17:44:44 +02:00
• dbe9f81091 fixes seed inconsistency and a huge performance bump RePixelatedMC 2024-10-17 16:03:49 +02:00
• 288e556f2a weee RePixelatedMC 2024-10-17 13:53:23 +02:00
• 70822e37de merger! RePixelatedMC 2024-10-17 13:30:35 +02:00
• 8b803a87f0 rename CrucibleDataProvider to MythicCrucibleDataProvider to fit naming conventions Julian Krings 2024-10-17 11:28:50 +02:00
• 3ae6e92eaf woops Julian Krings 2024-10-16 22:05:47 +02:00
• 0f3c52a5aa cleanup CrucibleDataProvider and fix furniture support Julian Krings 2024-10-16 21:59:38 +02:00
• 747be7aa09 MythicCrucible support. Currently under testing. Schroddinger 2024-09-13 14:12:22 -05:00
• 3f994c18ff sync RePixelatedMC 2024-10-14 12:24:10 +02:00
• 36b99ae4b0 sync RePixelatedMC 2024-10-13 21:54:37 +02:00
• 25dbc4dfd6 sync RePixelatedMC 2024-10-13 21:35:58 +02:00
• c35366caa4 mid save RePixelatedMC 2024-10-11 20:21:30 +02:00
• 76365e7875 woops Julian Krings 2024-10-09 13:01:31 +02:00
• 57649a9ec5 sync RePixelatedMC 2024-10-09 12:57:49 +02:00
• 03582751c5 improve CraftWorldInfo creation Julian Krings 2024-10-09 12:24:33 +02:00
• 13369bbf32 Merge remote-tracking branch 'origin/v3.4.3' into v3.4.3 RePixelatedMC 2024-10-08 13:42:39 +02:00
• f3b1109804 improve error handling Julian Krings 2024-10-07 20:46:00 +02:00
• 7f530a4b32 sync RePixelatedMC 2024-10-07 20:21:14 +02:00
• eda44a8ace fix memory worlds Julian Krings 2024-10-07 16:58:59 +02:00
• f6a354b890 fix missing ArrayType and add tabcompletion to vanilla loot tables Julian Krings 2024-10-06 18:27:48 +02:00
• db14861b40 mid save RePixelatedMC 2024-10-05 20:41:29 +02:00
• 457b691add whops Julian Krings 2024-10-04 15:03:09 +02:00
• d651f204f8 Merge pull request #1117 from hUwUtao/master Brian Fopiano 2024-10-02 00:43:56 -04:00
• a61787ecfe woops Julian Krings 2024-10-01 19:31:31 +02:00
• 093d77bf8a implement MemoryWorlds Julian Krings 2024-10-01 19:29:29 +02:00
• 0101130d7a Weee RePixelatedMC 2024-09-30 20:21:01 +02:00
• a3b2a17e2d Merge remote-tracking branch 'mcwg/v3.4.3' into v3.4.3 RePixelatedMC 2024-09-30 08:19:46 +02:00
• ff0a68c4f6 Mid changes - SYNC RePixelatedMC 2024-09-30 08:19:00 +02:00
• e0034dd718 implement vanilla loottables Julian Krings 2024-09-29 20:44:49 +02:00
• 7c6df58c15 Saving chunks still is a problem though RePixelatedMC 2024-09-29 19:00:52 +02:00
• 5d5c5ba9f4 Oh well RePixelatedMC 2024-09-28 18:43:05 +02:00
• 85aefcd206 mid save RePixelatedMC 2024-09-28 18:03:07 +02:00
• 34a67dc781 Merge remote-tracking branch 'mcwg/v3.4.3' into v3.4.3 RePixelatedMC 2024-09-28 14:35:37 +02:00
• 1a96128321 backup RePixelatedMC 2024-09-28 14:24:14 +02:00
• 1b0f4e6af6 Merge remote-tracking branch 'mcwg/v3.4.3' into v3.4.3 RePixelatedMC 2024-09-28 14:22:44 +02:00
• 9eb01dd6ca Merge remote-tracking branch 'mcwg/v3.4.3' into v3.4.3 RePixelatedMC 2024-09-28 14:22:05 +02:00
• bb6778dc63 Merge remote-tracking branch 'mcwg/v3.4.3' into v3.4.3 RePixelatedMC 2024-09-28 14:20:38 +02:00
• 9a24627ceb backup RePixelatedMC 2024-09-27 17:07:01 +02:00
• 7583b91d46 Merge remote-tracking branch 'newIris/v3.4.3' into v3.4.3 RePixelatedMC 2024-09-27 14:53:07 +02:00
• c418962411 Merge remote-tracking branch 'origin/v3.4.3' into v3.4.3 Julian Krings 2024-09-26 21:23:07 +02:00
• 8e8366b318 add jigsaw structure marker Julian Krings 2024-09-26 20:56:56 +02:00
• a4ad83d462 stuff RePixelatedMC 2024-09-25 19:21:43 +02:00
• ddf0e79a7e few new options! RePixelatedMC 2024-09-25 19:19:52 +02:00
• 2bd3ac7a9b Merge branch 'VolmitSoftware:master' into master stdpi 2024-09-25 02:00:31 +07:00
• 5e437b34e3 Revert "Update LICENSE.md" Brian Neumann-Fopiano 2024-09-24 14:58:10 -04:00
• d9c7f35709 Revert "Update LICENSE.md" old/iris4 Brian Neumann-Fopiano 2024-09-24 14:57:45 -04:00
• a5ef89a128 add irisDev task to copy javadocs and sources jar stdpi 2024-09-22 17:22:37 +07:00
• 558b8e4eca add more jar package (javadocJar sourcesJar) stdpi 2024-09-22 15:51:50 +07:00
• 0a001b8a63 fix: javadoc tolerate bad html stdpi 2024-09-22 04:48:18 +07:00
• 37893460f3 Update LICENSE.md Brian Fopiano 2024-09-09 16:59:14 -04:00
• 6c6c9654c1 Update LICENSE.md Brian Fopiano 2024-09-09 16:54:57 -04:00
• 898f815878 sync RePixelatedMC 2024-09-08 18:51:27 +02:00
• 49ee36b089 renames! RePixelatedMC 2024-09-08 18:08:16 +02:00
• 073be82dcc Sync! RePixelatedMC 2024-09-08 17:56:32 +02:00
• 713c3a4762 Merge remote-tracking branch 'origin/iris4' into iris4 RePixelatedMC 2024-09-08 17:45:44 +02:00
• b736377aec woops Julian Krings 2024-09-08 15:01:37 +02:00
• 62fff7a56e take server size into account when picking a server Julian Krings 2024-09-08 13:41:08 +02:00
• 5efb71eb3e Merge remote-tracking branch 'origin/iris4' into iris4 RePixelatedMC 2024-09-07 12:54:12 +02:00
• d22f49492f implement done packet into master and add safety checks for remote server version Julian Krings 2024-09-07 12:32:09 +02:00
• b65b112220 Merge branch 'refs/heads/v3.4.3' into iris4 Julian Krings 2024-09-06 23:32:21 +02:00
• c5456aa65c Merge remote-tracking branch 'origin/iris4' into iris4 Julian Krings 2024-09-06 23:21:30 +02:00
• 0a256eaa4c remote/cloud pregen! Julian Krings 2024-09-06 23:21:08 +02:00
• 7d07ee4eb2 Merge remote-tracking branch 'origin/iris4' into iris4 RePixelatedMC 2024-09-06 15:24:28 +02:00
• c98ed48ee2 reconnect players on dimension type registry change Julian Krings 2024-09-06 14:58:09 +02:00
• 9f392654d3 cleaner RePixelatedMC 2024-09-06 14:35:42 +02:00
• e21fdf46e0 - New Noise color < need further testing > - Iris schem converter RePixelatedMC 2024-09-05 21:57:40 +02:00