Commit graph

Select branches

Hide pull requests

1.10.2

1.11.2

1.12.2

1.14-rewrite

1.16

1.20.1

1.20.4

1.7.10

1.8.9

1.9

1.9.4

clean-start

main

#1

#100

#100

#1006

#102

#1030

#1030

#1032

#1057

#1059

#1059

#1060

#1060

#1079

#1097

#1097

#1107

#1112

#1112

#1213

#1216

#1227

#1229

#1231

#1234

#1240

#1279

#1285

#1286

#1289

#1292

#1293

#1294

#1297

#1301

#1316

#1334

#1340

#1343

#1345

#1346

#1347

#1355

#1372

#1372

#1374

#1377

#1380

#1380

#1381

#1383

#1389

#1390

#1393

#1393

#1395

#1396

#1398

#156

#159

#16

#17

#18

#185

#189

#192

#199

#2

#26

#261

#264

#27

#28

#29

#294

#3

#306

#318

#33

#33

#340

#350

#355

#355

#36

#37

#38

#38

#39

#4

#40

#42

#43

#44

#45

#462

#477

#48

#483

#49

#496

#5

#500

#522

#523

#529

#530

#555

#558

#56

#560

#560

#57

#60

#604

#611

#622

#636

#638

#643

#658

#66

#67

#68

#686

#691

#693

#702

#704

#711

#716

#72

#73

#756

#756

#757

#757

#762

#8

#803

#825

#83

#835

#836

#836

#837

#837

#838

#841

#844

#847

#850

#851

#852

#857

#859

#865

#868

#926

#926

#93

#934

#937

#937

#955

#965

#966

#976

#986

#99

Mono Color

• 76be3f4fc9 Add atomic reconstructor battery config Shadows_of_Fire 2018-02-17 16:08:40 -0500
• 890de9e006 fix melon bois ( Closes #1025 ) Shadows_of_Fire 2018-02-17 15:59:16 -0500
• a6abe9e203
  Merge 3d361838e0 into 5464981610 振云 (Percy) 2018-02-13 03:20:18 +0000
• 3d361838e0
  fix compile error 振云 (Percy) 2018-02-13 11:20:10 +0800
• dc1a2d13b8 meta is bad kthx Shadows_of_Fire 2018-02-11 20:51:19 -0500
• 3a56a962b2 bleh Shadows_of_Fire 2018-02-11 19:44:15 -0500
• c2209f0596 Not everything is a BlockCrops Shadows_of_Fire 2018-01-31 01:46:37 -0500
• 0b02277006 r130 Shadows_of_Fire 2018-01-31 00:09:43 -0500
• bfe876f423 Don't cast every IPlantable to BlockBush Shadows_of_Fire 2018-01-31 00:07:38 -0500
• f5ae3240f8 Fixes #1018 Shadows_of_Fire 2018-01-31 00:07:29 -0500
• 335f0fc37e r129 Shadows_of_Fire 2018-01-29 16:47:24 -0500
• f019fbfcda care about horses Shadows_of_Fire 2018-01-29 16:43:14 -0500
• cd4c1b9d1c big boi's big orders Shadows_of_Fire 2018-01-29 16:21:40 -0500
• 4412c62503 Closes #1014 Shadows_of_Fire 2018-01-29 03:28:12 -0500
• 00e99d3611 Smart Feeder Fixes #1017 Shadows_of_Fire 2018-01-29 03:17:38 -0500
• 227c227ddd Fixes #1015 Shadows_of_Fire 2018-01-29 02:17:31 -0500
• 9670fc7669 check for deny Shadows_of_Fire 2018-01-26 02:34:20 -0500
• 287e43c6ad Fix #1010 Shadows_of_Fire 2018-01-20 13:38:59 -0500
• 82de1c3dd2 Add extra null check to canFillFluidType (#1006) dalapo 2018-01-17 10:22:55 -0800
• 0a9f795d92
  Add extra null check to canFillFluidType dalapo 2018-01-17 09:06:18 -0800
• b13d7a031e r128 Shadows_of_Fire 2018-01-16 13:19:23 -0500
• 4e30e7bb3b Fixes #988 Shadows_of_Fire 2018-01-15 17:15:29 -0500
• bf451dceb1 Fixes #1005 (removes a debug sysout) Shadows_of_Fire 2018-01-15 17:00:32 -0500
• ffa274a7b2 r127 Shadows_of_Fire 2018-01-14 13:29:37 -0500
• b21089ad6b Fixes #995 Shadows_of_Fire 2018-01-14 13:25:36 -0500
• f17f982dab remov import Shadows_of_Fire 2018-01-12 17:48:21 -0500
• c5dbd778bb git forgot this Shadows_of_Fire 2018-01-12 17:47:01 -0500
• 426b363f8e clarity on oil recipe numbers Shadows_of_Fire 2018-01-12 17:46:38 -0500
• 31b3eaaf30 Redone some old code, tile entities are now saving their nbt to the itemstack again, also the MeeCreeps integration does work now Closes #998 canitzp 2018-01-05 14:38:06 +0100
• ce8061261b grow some more to account for speed loss Shadows_of_Fire 2018-01-04 14:51:19 -0500
• beef72d35d remove greenhouse glass tile entity Shadows_of_Fire 2018-01-04 14:40:58 -0500
• 4493a687ce make aiot accept sword enchantments Shadows_of_Fire 2018-01-04 14:27:16 -0500
• 8a1ed7b14b remove explicit tesla support Shadows_of_Fire 2017-12-23 15:20:01 -0500
• 0400298510 update forge Shadows_of_Fire 2017-12-23 00:51:45 -0500
• 953401d0af r126 Shadows_of_Fire 2017-12-18 07:20:39 -0500
• 1954da6edb Closes #985 Shadows_of_Fire 2017-12-12 01:54:12 -0500
• 9388605e24 Italian localization (#986) leomil72 2017-12-12 06:16:43 +0100
• ec6fde5255
  Merge pull request #1 from leomil72/leomil72-patch-1 leomil72 2017-12-10 15:23:04 +0100
• d36c278488
  Italian localization leomil72 2017-12-10 15:22:16 +0100
• b05ffcd0b6 r125 Shadows_of_Fire 2017-12-06 16:34:09 -0500
• 348b1eb92c Better check Shadows_of_Fire 2017-12-06 16:25:10 -0500
• 213716fc46 Block harvesting until tema uses new getDrops Shadows_of_Fire 2017-12-06 15:59:18 -0500
• da573459cb Update state when dropper gui closes (fixes #972) Shadows_of_Fire 2017-12-02 13:38:36 -0500
• 2a751355d7 Adds Sack Blacklist (Closes #974) Shadows_of_Fire 2017-12-01 16:19:52 -0500
• 872e124cd8 bleh Shadows_of_Fire 2017-11-30 11:13:58 -0500
• 3bbf2c3d4a Ensure holding of the sack. Closes #975 Shadows_of_Fire 2017-11-30 02:58:26 -0500
• ea06819f38 Update zh_CN language file for 1.12 (#976) tartaric_acid 2017-11-30 15:48:58 +0800
• 0b1736a4d9 fix a typo TartaricAcid 2017-11-30 15:39:45 +0800
• e8430b1161 finish zh_CN language file update TartaricAcid 2017-11-30 15:39:08 +0800
• 146380a573 Complete part of the translation. TartaricAcid 2017-11-29 23:27:25 +0800
• 15b2cf2d5a update forge Shadows_of_Fire 2017-11-27 16:30:10 -0500
• 0d6adca7c7 <> is illegal Shadows_of_Fire 2017-11-20 11:46:02 -0500
• bb1568afbc Fixes typo in biomash manual (#966) Mike Botsko 2017-11-17 11:04:46 -0800
• 5a9586b417 Fixes typo in biomash manual Mike Botsko 2017-11-17 11:03:07 -0800
• b7e6e7909b
  Merge pull request #965 from prism/fix/typo Brennan Ward 2017-11-16 22:15:01 -0500
• a23b0a2378 Fixes typo in lens of disenchanting manual Mike Botsko 2017-11-16 19:00:55 -0800
• 9bed6f7ea5 no more lamp sneak Shadows_of_Fire 2017-11-15 18:11:17 -0500
• 9ca8e3d1ce r124 Shadows_of_Fire 2017-11-03 22:14:31 -0400
• 6ded1cc7b3
  BAD NULL Brennan Ward 2017-11-03 13:37:21 -0400
• bb8a42bfed r123 Shadows_of_Fire 2017-11-02 20:02:40 -0400
• 856d62f78c remov null Shadows_of_Fire 2017-11-02 17:49:53 -0400
• 636156d2ee r122 Shadows_of_Fire 2017-10-31 20:24:33 -0400
• e95da124f1 touch up jei handler Shadows_of_Fire 2017-10-31 18:31:34 -0400
• 585777b9e0 Closes #885 Shadows_of_Fire 2017-10-31 18:01:15 -0400
• c09ebe299a
  Merge pull request #955 from Artemish/master Brennan Ward 2017-10-31 16:06:56 -0400
• aaedc88953 Added Compost recipes to JEI Artemish 2017-10-30 21:19:48 -0500
• 05e37320ba Don't pickup things from conveyor belts Shadows_of_Fire 2017-10-23 13:08:17 -0400
• 100b10eb7a no more display stand torches bleh Shadows_of_Fire 2017-10-05 18:36:35 -0400
• 19402f3650 Fixes #929 Shadows_of_Fire 2017-10-05 09:06:26 -0400
• 6b4d8fac97 Merge f2fa06f3c2 into 6a16bbfc4b OneEyeMaker 2017-10-04 06:54:43 +0000
• f2fa06f3c2 Added configuration for Heat Collector OneEyeMaker 2017-10-04 09:31:23 +0300
• 9fc905fb11 Added configuration for Solar Panel OneEyeMaker 2017-10-04 09:24:21 +0300
• 59e0239c7d Added configuration for Firework Box OneEyeMaker 2017-10-04 09:17:32 +0300
• 55c948f144 Added configuration for Farmer OneEyeMaker 2017-10-04 09:08:05 +0300
• 15d3f74c53 Added configuration for Long-Range Breaker OneEyeMaker 2017-10-04 08:35:24 +0300
• 5969db45d0 Changed options names for consistency OneEyeMaker 2017-10-04 08:23:22 +0300
• 2e9c79b832 Added configuration for Coffee Maker OneEyeMaker 2017-10-04 08:17:30 +0300
• c84d6574f6 Rearranged configuration entries OneEyeMaker 2017-10-04 07:44:32 +0300
• f0f3ae4ffe Added missing configuration for Lava Factory OneEyeMaker 2017-10-03 11:51:00 +0300
• cfbbf9d59d Added configuration for Item Repairer OneEyeMaker 2017-10-03 09:33:20 +0300
• 30ca7b5937 Added configuration for Lava Factory OneEyeMaker 2017-10-03 09:15:51 +0300
• 06ab7c817a Added configuration for Vertical Digger OneEyeMaker 2017-10-03 08:55:58 +0300
• 789bd76e0a Added configuration for Phantom blocks OneEyeMaker 2017-10-03 08:31:54 +0300
• 55827f10b3 Added yet another configuration option for Shock Absorber OneEyeMaker 2017-10-03 08:03:37 +0300
• 9ee66ecb2c Added configuration for Player Interface OneEyeMaker 2017-10-03 07:55:38 +0300
• aefcc32d91 Added configuration for Shock Absorber OneEyeMaker 2017-10-03 07:34:49 +0300
• 6a16bbfc4b Merge pull request #934 from thiakil/itemstack-handler Brennan Ward 2017-10-01 01:17:00 -0400
• 2f2de97bf2 don't return internal copy of itemstack on simulate Xander 2017-10-01 13:05:47 +0800
• 7d28e768ca r121 Shadows_of_Fire 2017-09-29 22:49:50 -0400
• 2f505dc24a Fixes #932 Shadows_of_Fire 2017-09-29 22:47:10 -0400
• 075862361d Added configuration for Crusher and Double Crusher OneEyeMaker 2017-09-28 09:05:58 +0300
• f47f3a5225 Added configuration for Powered Furnace OneEyeMaker 2017-09-28 08:44:20 +0300
• 6dec2b274e Added configuration for Laser Relays OneEyeMaker 2017-09-28 08:28:04 +0300
• 6145ec9470 Added configuration for Bio Reactor OneEyeMaker 2017-09-28 07:26:38 +0300
• 251663030e Moved configuration option to another category OneEyeMaker 2017-09-27 08:42:57 +0300
• 2d001c16d1 Added configuration for Leaf-Eating Generator OneEyeMaker 2017-09-27 08:34:28 +0300
• 17e4bd8547 Added configuration for Oil Generator OneEyeMaker 2017-09-27 08:11:30 +0300
• c95110fbf7 Added configuration for Coal Generator OneEyeMaker 2017-09-27 07:35:20 +0300
• 7937f55639 Moved field declaration back OneEyeMaker 2017-09-27 07:22:13 +0300
• a9989ed94e Added configuration for Energizer and Enervator OneEyeMaker 2017-09-26 09:00:48 +0300