Commit graph

3413 commits

Author SHA1 Message Date
modmuss50
63b3e68d01 #releaseBuild 2018-03-23 11:07:36 +00:00
drcrazy
3e8b63645b Fixed license header. 2018-03-23 13:21:18 +03:00
drcrazy
67fab7cdf2 Fixed deprecation warning. 2018-03-23 12:05:22 +03:00
drcrazy
a69fa60436 Updated Advanced Drill behaviour. Closes #1463 2018-03-23 02:46:07 +03:00
modmuss50
d272111d16 Merge remote-tracking branch 'origin/1.12' into 1.12 2018-03-22 22:21:14 +00:00
modmuss50
d930d2015d Changes to the overclocker values, feedback wanted. 2018-03-22 22:20:56 +00:00
drcrazy
f1e659d22d Updated AOE block break for advanced drill. Some work on #1463 2018-03-22 18:03:51 +03:00
drcrazy
772b0a5d65 Removed unused imports in CT classes. 2018-03-22 18:02:54 +03:00
temp1011
a36c2d4065 Fix Drill break speed in certain conditions (#1428)
Some work on AdvancedDrill break speed. Thanks to temp1011
2018-03-22 15:39:32 +03:00
modmuss50
1a5299df55 #releaseBuild 2018-03-20 19:47:03 +00:00
modmuss50
23b4ef1038 Merge remote-tracking branch 'origin/1.12' into 1.12 2018-03-20 17:49:29 +00:00
modmuss50
4b1a1b796b Allow upgrade item to stack to 16 (Still stacks to 1 in machine) + Fix potential loss of items when shift clicking. 2018-03-20 17:49:13 +00:00
drcrazy
2e7dc82b86 Hide scrapboxes output in JEI by default. 2018-03-19 15:20:42 +03:00
modmuss50
da6016b692 Cleanup recipe ore dict setting. #1455 2018-03-19 09:41:20 +00:00
modmuss50
453fd3856a Fix Quantum Chest holding its items when broken, fixes #1462 2018-03-19 09:26:16 +00:00
modmuss50
369b8a6266 Fixes #1461 2018-03-18 23:43:03 +00:00
modmuss50
9e3e2e204c Fixes #1457 2018-03-18 23:35:22 +00:00
modmuss50
c0c20d91b9 Fixes #1459 2018-03-18 23:27:41 +00:00
modmuss50
32cb8a1b52
#releaseBuild 2018-03-11 13:07:15 +00:00
modmuss50
5f162d08b1
Fix compile 2018-03-10 20:20:24 +00:00
modmuss50
06f7f64efb
Add stone variants for the other end ores. 2018-03-10 20:18:53 +00:00
modmuss50
f1a3387fbf
Add extractor support to craft tweaker 2018-03-10 19:50:24 +00:00
modmuss50
d7ce35428c
Add a config option to change the textures of the end ores to use the stone background.
I still need to add the other ores, but this is the main one that needs doing.
2018-03-09 19:57:20 +00:00
modmuss50
23b3b7335c #releaseBuild 2018-03-06 21:31:23 +00:00
modmuss50
3b914e658c Allow using ore dict entries in CraftTweaker Closes #1396 2018-03-06 21:28:05 +00:00
modmuss50
d948db1b7f Possible fix for #1450 2018-03-06 21:07:49 +00:00
drcrazy
6b68a8aef2 Temporary fix for #1429. 2018-03-06 02:48:08 +03:00
drcrazy
111ee7630a Updated API reference for recipes. 2018-03-05 14:45:23 +03:00
drcrazy
4a369d0ee7 Updated buildcraft version. More oredict for centrifuge. 2018-02-22 13:35:18 +03:00
drcrazy
7f4d5ab401 Removed duplicate recipe for dirt in centrifuge. 2018-02-21 10:51:15 +03:00
drcrazy
a80d3eb9ca Removed duplicate recipe for Distillation tower 2018-02-19 18:21:10 +03:00
modmuss50
87b1fb9200
Should fix gradle 2018-02-19 15:01:37 +00:00
modmuss50
804971bb70
Update gradle + Rewrite maven handling to fix #1442 2018-02-19 14:12:08 +00:00
modmuss50
ec6fee9230
Fix crash with OC compat 2018-02-16 20:14:36 +00:00
drcrazy
0ecdce2717 Made solar panels configurable. 2018-02-16 12:17:05 +03:00
modmuss50
a54de62a6a Some more basic methods for open computers 2018-02-14 14:12:31 +00:00
modmuss50
2180fe4ef2 Initial work on open computers support, more to come in the future.
When things are a bit more final with it, I will add some docs onto the wiki pages.
2018-02-13 23:56:38 +00:00
modmuss50
f7008d9c87 Fix Issues with fake players breaking wood logs, fixes #1436 2018-02-13 17:44:46 +00:00
drcrazy
c5d162c527 Fixed GUI progress for fluid generators. Some work on #1430 2018-02-13 14:27:31 +03:00
冷风
ce9066e546 Update zh_cn.lang (#1440) 2018-02-13 08:32:03 +00:00
drcrazy
637d7d4ce9 #releaseBuild 2018-02-13 02:11:03 +03:00
drcrazy
2f7ce0f563 Limited Centrifuge bottom slot to cells only. 2018-02-13 01:56:18 +03:00
Dimmerworld
217d7e1a44 Display(in hand) adjustments for Alarm, Led, and led2 (#1439) 2018-02-12 17:18:33 +03:00
modmuss50
9c7f1995a8
Update year in license 2018-02-11 14:08:13 +00:00
modmuss50
9c3d9d8e27
Merge remote-tracking branch 'origin/1.12' into 1.12 2018-02-11 14:01:45 +00:00
modmuss50
3fe260b739
Revert "Add a config to lock the rolling machine recipe + some optimisations #1412"
This reverts commit 0b8f139
2018-02-11 14:01:24 +00:00
Dimmerworld
27dacb327a Alarm cleanup + tooltip and techreborn manual UI (#1437)
* Alarm cleanup and tooltip, Tech manual UI

* add peskty comma

* Compress png

* Rename to wiki and asked user before opening browser
2018-02-11 13:59:52 +00:00
Dimmerworld
9349ffe264 Update forge and Sound options for Alarm (#1435)
* Update forge and Sound options for Alarm

* Revert changes to gradle wrapper properties

* Cleanup imports

* Removed sneaky debugging stuff
2018-02-10 11:53:11 +00:00
drcrazy
38933ca8a8 Made centrifuge to use oreDict for some inputs 2018-02-07 15:36:56 +03:00
drcrazy
543a2a7271 Added removeAll for reactor and rolling machine. Closes #1427 2018-02-02 18:33:45 +03:00