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

• 010a1e9e91 Merge branch 'VolmitSoftware:master' into fix_jigsaw Julian Krings 2024-04-17 21:16:08 +02:00
• 856c926cde add min distance to jigsaw structures CrazyDev22 2024-04-17 21:15:15 +02:00
• 72ed312654 wops RePixelatedMC 2024-04-16 18:09:03 +02:00
• c7fe4723f7 Merge remote-tracking branch 'origin/master' into PixelatedDev RePixelatedMC 2024-04-16 17:18:51 +02:00
• bfbea83a4a - Fixed NMS biome height. - Improved /iris load - Improved Vanilla height converter - Removed WorldCreation unstable message RePixelatedMC 2024-04-16 17:18:02 +02:00
• 55c58fe896 Merge pull request #1087 from RePixelatedMC/PixelatedDev RePixelatedMC 2024-04-16 16:34:12 +02:00
• 72949e0950 Update IrisSettings.java RePixelatedMC 2024-04-16 16:32:52 +02:00
• 61c0ddb15b fix random jigsaw rotation and offset CrazyDev22 2024-04-16 13:29:06 +02:00
• 9ac4024e4e v+ 3.2.3-1.19.2-1.20.4 Brian Neumann-Fopiano 2024-04-15 11:43:09 -04:00
• 7fb2a51a33 sync RePixelatedMC 2024-04-12 17:08:13 +02:00
• 5b7c0b2bc3 Merge branch 'PixelatedDev' of https://github.com/RePixelatedMC/Iris into PixelatedDev RePixelatedMC 2024-04-09 20:07:50 +02:00
• fc15175ff9 Improved? RePixelatedMC 2024-04-09 20:06:32 +02:00
• 1eec3a09c1 now it should work RePixelatedMC 2024-04-09 18:05:27 +02:00
• 60d349dd8b test RePixelatedMC 2024-04-09 17:05:43 +02:00
• 0c8d144ffb Merge remote-tracking branch 'VolmitDev/smartHeight' into PixelatedDev RePixelatedMC 2024-04-09 17:04:45 +02:00
• b898f73a05 Fixed another potential mem leak Added the base of smart320height RePixelatedMC 2024-04-09 17:04:32 +02:00
• c2b9b0ba0e add smartVanillaHeight CrazyDev22 2024-04-09 16:52:14 +02:00
• 206a4e9057 Revert "sync laptop" RePixelatedMC 2024-04-06 17:07:14 +02:00
• 83a0a7dd54 sync laptop RePixelatedMC 2024-04-05 18:43:30 +02:00
• 63b8a935ae sync laptop RePixelatedMC 2024-04-05 18:43:30 +02:00
• 16affd11cc fix HMCLeaves leave decay CrazyDev22 2024-04-04 23:46:14 +02:00
• 33b0dec9da fix ClassCastException when replacing to IrisBlockData CrazyDev22 2024-04-04 23:45:25 +02:00
• 121a463788 v+ 3.2.2-1.19.2-1.20.4 Brian Neumann-Fopiano 2024-04-03 03:03:32 -04:00
• 3625e70948 Merge pull request #1085 from VolmitDev/impl_mmoitem Julian Krings 2024-04-02 19:03:25 +02:00
• 3d90207172 make MMOItems getItemTypes synchronous to reduce lag CrazyDev22 2024-04-02 12:03:00 +02:00
• ca7dc19c81 make mmoitems item creation synchronous CrazyDev22 2024-04-01 23:20:11 +02:00
• d0f16dbbc4 fix using Type::toString instead of Type::getId for mmoitems CrazyDev22 2024-04-01 23:18:41 +02:00
• fd91c223b7 add unload debug tools CrazyDev22 2024-04-01 22:08:28 +02:00
• 93690b766c implement MMOItemsDataProvider CrazyDev22 2024-04-01 17:26:33 +02:00
• cc4af9950b fix scanning for item provider instead of block provider to processUpdate CrazyDev22 2024-04-01 17:26:10 +02:00
• a6281483dd Merge pull request #1084 from RePixelatedMC/PixelatedDev Brian Fopiano 2024-03-31 12:45:06 -04:00
• f587816b30 merges RePixelatedMC 2024-03-31 18:33:35 +02:00
• eea3c3ab0b Merge remote-tracking branch 'origin/master' into PixelatedDev RePixelatedMC 2024-03-31 18:25:26 +02:00
• ba68ab9e06 f RePixelatedMC 2024-03-31 17:58:47 +02:00
• eb94d97ea4 - Fixed caves breaksurface - changes RePixelatedMC 2024-03-31 17:53:10 +02:00
• 04ad02719c d Brian Neumann-Fopiano 2024-03-30 18:48:00 -04:00
• f68f25b92f Merge pull request #1083 from VolmitDev/fix_object_collision_check Brian Fopiano 2024-03-30 17:51:40 -04:00
• 767cca36c8 Merge pull request #1080 from svdgoor/no-camel-1-19-R3 Brian Fopiano 2024-03-30 17:50:44 -04:00
• b30172fe89 Merge pull request #1082 from VolmitDev/shut_up_spigot Brian Fopiano 2024-03-30 17:49:31 -04:00
• b2934b0cc2 fix object collision check CrazyDev22 2024-03-27 19:02:20 +01:00
• 50686795d0 - Added /iris what region - Sort of Fixed EngineStatus - Added /iris hasAccess - Added /iris irisworlds/worlds - Added Some dev commands - Redid / improved the mantle tectonic unload - Convert still not working so ignore that - Cleaned Iris of IrisPackBenchmarking.java im redoing it on second thought. - Adjusted build.gradle - Renamed some tectonic stuff - Fixed Eta - Fixed entities spawning inside blocks or at least it should. - Lib update fixes all the iris titles/actionbars - Cave spawning adjustments, now they get engine height if caveStartHeight is too large. <optional> - Perhaps more? RePixelatedMC 2024-03-20 11:32:44 +01:00
• 5561a4dc2f fix wrong color bug CrazyDev22 2024-03-20 08:46:56 +01:00
• 15b8780e17 remove usage of System.out CrazyDev22 2024-03-20 08:44:00 +01:00
• 15c4d312cb Merge remote-tracking branch 'origin/master' svdgoor 2024-03-18 17:29:02 +01:00
• ccbea89253 prevent spawning camels on 1.19.R3 svdgoor 2024-03-18 17:28:08 +01:00
• 7b1e666b3b - No studio tectonic clearing. RePixelatedMC 2024-03-18 11:22:35 +01:00
• 8af212fca8 - Fixed entities spawning inside blocks or at least it should. RePixelatedMC 2024-03-17 17:55:08 +01:00
• 352ee7a622 Merge pull request #1079 from VolmitDev/better_plugin_compat Brian Fopiano 2024-03-17 02:55:19 -04:00
• f26d0fac0b Merge pull request #1078 from VolmitDev/fix_v1_19_R3 Brian Fopiano 2024-03-17 02:55:03 -04:00
• 9612fef2a4 - Added /iris what region - Sort of Fixed EngineStatus - Added /iris hasAccess - Added /iris irisworlds/worlds - Added Some dev commands - Redid / improved the mantle tectonic unload - Convert still not working so ignore that - Cleaned Iris of IrisPackBenchmarking.java im redoing it on second thought. - Adjusted build.gradle - Renamed some tectonic stuff - Perhaps more? RePixelatedMC 2024-03-16 12:40:40 +01:00
• a691d49abc fix only the 0 0 chunk being updated CrazyDev22 2024-03-08 19:35:07 +01:00
• 289eca35ec fix missing method parameter types CrazyDev22 2024-03-07 19:41:28 +01:00
• e9ca30257c woops CrazyDev22 2024-03-07 18:48:09 +01:00
• 6b21997baa Merge branch 'VolmitSoftware:master' into better_plugin_compat Julian Krings 2024-03-07 17:24:59 +01:00
• 6d3dbf84ef add HMCLeaves compatibility CrazyDev22 2024-03-07 17:24:09 +01:00
• eb45339c81 add oraxen furniture support CrazyDev22 2024-03-07 17:23:32 +01:00
• 65e3fdd26c make implementing blocks that need world context possible CrazyDev22 2024-03-07 17:23:00 +01:00
• 34cad85942 - Fixed Eta RePixelatedMC 2024-03-01 12:32:53 +01:00
• e407679d2b - Improved eta calculation RePixelatedMC 2024-03-01 11:44:00 +01:00
• 8a08a3e148 Remove Cherry Grove from 1.19.4 biomes list Julian Krings 2024-02-27 11:30:40 +01:00
• a01d27d273 Merge pull request #1075 from VolmitDev/fix_pregen Brian Fopiano 2024-02-22 18:42:16 -05:00
• 43f642ae8b Merge pull request #1076 from VolmitDev/custom-spawn-reason Brian Fopiano 2024-02-22 18:41:59 -05:00
• 93c1265de9 Add implement custom spawn reason CrazyDev22 2024-02-22 21:25:37 +01:00
• d08600fbaa Fix Pregen oversight CrazyDev22 2024-02-22 17:27:38 +01:00
• fb9f8d28f4 - Lib update fixes all the iris titles/actionbars - Iris .schem Converter RePixelatedMC 2024-02-21 21:24:35 +01:00
• cd3e9f772d Merge pull request #1074 from MoritzR200/master Brian Fopiano 2024-02-17 09:54:59 -05:00
• 7a95441799 Merge pull request #1071 from VolmitDev/fix_nullpointer Brian Fopiano 2024-02-17 09:54:40 -05:00
• 9345828c97 Merge pull request #1073 from RePixelatedMC/PixelatedDev Brian Fopiano 2024-02-17 09:54:14 -05:00
• 58d88dd079 Fixed backslashes being used as file separators regardless of platform (in /iris import)). MoritzR200 2024-02-17 13:31:00 +01:00
• 6cbc2374b3 whoopsies RePixelatedMC 2024-02-15 20:43:29 +01:00
• 12bd11386d Merge remote-tracking branch 'CrazyDev/jigsaw_placement_fix' into PixelatedDev RePixelatedMC 2024-02-14 09:13:37 +01:00
• 0497045388 - Fixed /Iris height when ran in console - Added Dynamic worldHeight RePixelatedMC 2024-02-13 08:51:48 +01:00
• d3f1640855 Merge branch 'VolmitSoftware:master' into jigsaw_placement_fix Julian Krings 2024-02-12 21:30:19 +01:00
• 960e2fcc61 try again if engine setup fails CrazyDev22 2024-02-12 11:43:21 +01:00
• 6a012cf400 fix setup being set before engine setup CrazyDev22 2024-02-12 11:42:47 +01:00
• d658ec2099 oops Brian Neumann-Fopiano 2024-02-04 17:37:00 -05:00
• c9a07bd9d7 Merge pull request #1069 from RePixelatedMC/PixelatedDev 3.2.0-1.19.2-1.20.4 Brian Fopiano 2024-01-26 07:35:39 -05:00
• c0136585e6 Merge remote-tracking branch 'origin/master' RePixelatedMC 2024-01-26 10:59:14 +01:00
• dc4cfc49ad Merge remote-tracking branch 'origin/master' into PixelatedDev RePixelatedMC 2024-01-26 10:58:48 +01:00
• 9fc72868d7 disabled perms check RePixelatedMC 2024-01-26 10:57:03 +01:00
• 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