Commit Graph - Iris

mirrors/Iris

Fork 0

mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-08-17 16:55:57 +00:00

Commit Graph

Select branches

Hide Pull Requests

dev

feat/better_block_states

feat/datapack_structures

feat/exclusions-map

feat/folia

feat/headless

feat/kts

feat/map

feat/mob_spawning_v2

feat/static_placements

fix/deco-fixes

fix/rarity

fix/seed_malfunction

master

old/iris3

old/iris4

old/v3.4.3-dev

#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

#1215

#1217

#1217

#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

1a0475433c Hunky Stuff... Daniel Mills 2020-10-24 00:29:31 -04:00
e841bfad68 Hunk Views Daniel Mills 2020-10-24 00:29:20 -04:00
5d3faba762 Stream support Daniel Mills 2020-10-24 00:29:13 -04:00
87cce116af f Daniel Mills 2020-10-23 19:15:41 -04:00
356c97a4b2 Stop spawning OCEAN_RUIN Daniel Mills 2020-10-23 18:42:19 -04:00
dd6c20ce74 Fix log colors. Closes #22 Andrew Baker 2020-10-23 11:00:36 -07:00
e939ffaf2d V+ Daniel Mills 2020-10-23 13:13:48 -04:00
5a6f6fba2e Fixes & merge Daniel Mills 2020-10-23 13:05:16 -04:00
99022055cf Fix non overworld environments using overworld as the environment... Daniel Mills 2020-10-23 11:27:59 -04:00
68030a4ae7 Fix decorations Daniel Mills 2020-10-23 11:25:38 -04:00
75ca9240a9 Tops Daniel Mills 2020-10-23 11:25:13 -04:00
6d917b31e0 Support decoration tops for stack decorations Daniel Mills 2020-10-23 10:21:39 -04:00
75e508bfd0 Add note BuildTools 2020-10-23 14:08:41 +02:00
23136be280 Add thread count getter BuildTools 2020-10-23 13:59:38 +02:00
527a0f5c70 Update CommandIrisStructure.java BuildTools 2020-10-23 11:10:42 +02:00
9fbf9539ee Update CommandIrisObject.java BuildTools 2020-10-23 11:08:55 +02:00
dab69b2ffe Update CommandIrisWhatBlock.java BuildTools 2020-10-23 10:20:42 +02:00
7fdbebfb70 Fix bugs (see desc) BuildTools 2020-10-23 09:55:48 +02:00
06ffe5cd06 Fix ex for fluid height Daniel Mills 2020-10-22 19:23:05 -04:00
56203c3ee2 30% Performance Improvement Daniel Mills 2020-10-22 19:05:52 -04:00
4f5b562e04 Update CommandIrisPregen.java BuildTools 2020-10-23 00:37:00 +02:00
e247753f96 Update CommandIrisRegen.java BuildTools 2020-10-23 00:34:49 +02:00
575b5482b6 Update CommandIrisStructureCreate.java BuildTools 2020-10-23 00:30:06 +02:00
aa5a72b788 Update CommandIrisStructureCreate.java BuildTools 2020-10-23 00:21:32 +02:00
d8cb9f2c03 Update CommandIrisStructureCreate.java BuildTools 2020-10-23 00:18:04 +02:00
5241182520 Merge branch 'master' of https://github.com/cyberpwnn/Iris BuildTools 2020-10-23 00:09:26 +02:00
61d8f2e1d4 Update CommandIrisStructureCreate.java BuildTools 2020-10-23 00:09:13 +02:00
a8031a510f Fix warnings Daniel Mills 2020-10-22 18:08:57 -04:00
c191060b73 Fix command issues with not in iris world Daniel Mills 2020-10-22 18:06:58 -04:00
bfe7cf0ed7 Repush Daniel Mills 2020-10-22 17:57:01 -04:00
a4d72eefbc Merge remote-tracking branch 'origin/master' Daniel Mills 2020-10-22 17:56:54 -04:00
7b98105a0f Terrain stream Daniel Mills 2020-10-22 17:56:48 -04:00
e741dd6f65 Update CommandIrisStructureCreate.java BuildTools 2020-10-22 23:56:45 +02:00
9ef1c1935d Drop sky providers Daniel Mills 2020-10-22 11:17:40 -04:00
43562580d6 Fixes Daniel Mills 2020-10-22 11:16:28 -04:00
986250543e

Merge pull request #18 from cyberpwnn/citizens Dan 2020-10-22 11:10:21 -04:00
90ed2f084d

Merge pull request #17 from cyberpwnn/master Dan 2020-10-22 11:09:24 -04:00
d353e186a5

Merge branch 'citizens' into master Dan 2020-10-22 11:09:07 -04:00
a8b684d966 Fixes Daniel Mills 2020-10-22 11:07:47 -04:00
3ec70f9fb3 Merge branch 'master' of https://github.com/cyberpwnn/Iris into citizens Andrew Baker 2020-10-21 18:05:51 -07:00
6199256058 Poor attempt at adding pregen pausing BuildTools 2020-10-21 17:47:20 +02:00
265936a791 V+ Daniel Mills 2020-10-21 11:11:32 -04:00
2422013ddf fix typo BuildTools 2020-10-21 17:10:19 +02:00
2641220fb0 Fix pregen resume issue Daniel Mills 2020-10-21 11:04:19 -04:00
68e1830d8e Fix std loot Daniel Mills 2020-10-21 11:01:59 -04:00
fd3f20ed52 Fixes & revert Daniel Mills 2020-10-21 10:28:40 -04:00
ccdb136b9a Tweaks Daniel Mills 2020-10-21 10:03:15 -04:00
0a0617c5fc Command fixes Daniel Mills 2020-10-21 10:02:36 -04:00
b3e1c48f97 Stupid spigot & paper Daniel Mills 2020-10-20 10:52:30 -04:00
88d589bae5 1.16 NMS Support Daniel Mills 2020-10-20 10:16:19 -04:00
0fb5cbdb06 Hmm Daniel Mills 2020-10-20 09:51:48 -04:00
d47da11ce8 INMS Daniel Mills 2020-10-20 09:22:14 -04:00
743a4f97ba NMS Daniel Mills 2020-10-20 09:22:09 -04:00
eac1247f36 FIxes Daniel Mills 2020-10-19 10:04:06 -04:00
57f60326f3 PF Daniel Mills 2020-10-19 09:20:57 -04:00
3235f6e388 V+ Daniel Mills 2020-10-19 06:10:41 -04:00
a607a6a137 Fix structure manager with paper & worldedit Daniel Mills 2020-10-19 06:10:37 -04:00
2348d4a855 Fix block data issues Daniel Mills 2020-10-19 06:10:27 -04:00
e16f6c87c2 Remove loot tries Daniel Mills 2020-10-19 06:10:19 -04:00
598962f5f3 Entities support baby & panda genes Daniel Mills 2020-10-19 06:10:11 -04:00
8a241bb671 Fix loot Daniel Mills 2020-10-19 06:10:03 -04:00
8bcb3d9e0e Fix npe and cmod on parallax layer Daniel Mills 2020-10-19 06:09:54 -04:00
2317220666 What block show more info Daniel Mills 2020-10-19 06:09:41 -04:00
47c1b58aa5 Loot fixes Daniel Mills 2020-10-19 06:09:34 -04:00
0039582f28 Summon command Daniel Mills 2020-10-19 06:09:28 -04:00
60a529375c Fix Regen Crash Daniel Mills 2020-10-19 03:46:05 -04:00
d42bcb0ab9 Fix fx and spawning before terrain is setup Daniel Mills 2020-10-19 03:43:33 -04:00
4b11bcb77b Merge remote-tracking branch 'origin/master' Daniel Mills 2020-10-19 03:28:04 -04:00
6775edddab Move listing to iris dims Daniel Mills 2020-10-19 03:27:56 -04:00
039a732148

Update .gitignore Andrew 2020-10-18 16:36:22 -07:00
9aac70c734 Remove IDEA cancer Andrew 2020-10-18 16:35:49 -07:00
dc6c38cf24

Update .gitignore Andrew 2020-10-18 16:33:57 -07:00
a2b09cb2aa Remove Iris.iml from repo Andrew 2020-10-18 16:32:06 -07:00
6e6453f897

Update .gitignore Andrew 2020-10-18 16:29:25 -07:00
f16de65934 Remove .idea from repo Andrew 2020-10-18 16:27:54 -07:00
fa0a5efb25 VP Daniel Mills 2020-10-18 16:42:03 -04:00
1ffb6b9395 WC Daniel Mills 2020-10-18 16:41:40 -04:00
16d746fb8d Add Citizens support to IrisEntity.java Andrew 2020-10-18 11:44:30 -07:00
e8629fab66 Add CitizensLink class variable to Iris.java Andrew 2020-10-18 11:40:51 -07:00
9cb9719461 Create Citizenslink Andrew 2020-10-18 11:27:31 -07:00
564f02b188 Reload config command Daniel Mills 2020-10-18 13:22:50 -04:00
d67596117f Fixes Daniel Mills 2020-10-18 08:39:26 -04:00
ffecbb2298 Merge remote-tracking branch 'origin/master' Daniel Mills 2020-10-18 08:39:20 -04:00
b5fe2bcc60 Add Citizens to pom.xml Andrew 2020-10-17 17:30:43 -07:00
7641d6dbdf IDEA bs Andrew 2020-10-17 17:07:34 -07:00
54c5e3a8e3 Merge remote-tracking branch 'origin/master' Andrew 2020-10-17 17:06:35 -07:00
d8427cdbcd IDEA bs Andrew 2020-10-17 17:05:57 -07:00
fe03a12bec

Update README.md Andrew 2020-10-17 15:36:59 -07:00
37fca3fc3e Update IDEA files Andrew 2020-10-17 13:45:12 -07:00
4dcdbdec3a Fix slabs Daniel Mills 2020-10-17 13:29:07 -04:00
564c79c411 Bugfixes Daniel Mills 2020-10-17 13:20:38 -04:00
ea46c78a15 Faster block data! Daniel Mills 2020-10-17 02:03:41 -04:00
93529cda60 Attempt at faster block data Daniel Mills 2020-10-17 00:02:15 -04:00
13bf6a89cb Fix ctc Daniel Mills 2020-10-16 23:48:21 -04:00
468c69d2dd Bugfixes & Performance Improvements Daniel Mills 2020-10-16 23:45:44 -04:00
4ccfa8c3b6 Bugfixes for 13 Daniel Mills 2020-10-16 09:50:27 -04:00
b9a447453f

Merge pull request #16 from cyberpwnn/performance-passes Dan 2020-10-16 02:00:13 -04:00
3daf03d89a Revert "Performance pass 5 (String concatenation in loop)" Andrew 2020-10-15 22:46:05 -07:00
1a7d4c2c37 Revert "Performance pass 4 (String concatenation as argument to 'StringBuilder.append()' call)" Andrew 2020-10-15 22:45:09 -07:00
c7f612dac0 Fixes Daniel Mills 2020-10-16 01:59:18 -04:00