Commit graph

750 commits

Author SHA1 Message Date
drcrazy
38933ca8a8 Made centrifuge to use oreDict for some inputs 2018-02-07 15:36:56 +03:00
drcrazy
73aa9f1d5e Nerfed oil cell energy output. Closes #1424 2018-01-31 15:39:00 +03:00
modmuss50
af57ef708d Fixes #1426 2018-01-31 09:46:26 +00:00
modmuss50
8a4aafb042 Add some missing configs + small cleanup 2018-01-30 23:32:45 +00:00
drcrazy
44b6f20357 Updated scrapboxinator to crafter and new GUI. 2018-01-19 18:07:52 +03:00
drcrazy
4fc45221a2 Removed scrapboxlist usage. Closes #1407 2018-01-17 13:53:25 +03:00
drcrazy
52e1fb2dc9 Fixed compressor recipe for lapis. Second point from #1396 2018-01-12 18:48:09 +03:00
drcrazy
af755a9f6e Changed carbon fiver recipe to shaped. Closes #1394 2018-01-12 01:13:44 +03:00
drcrazy
27b1535242 Added oreDict for blockBronze. Closes #1401 2018-01-11 14:53:40 +03:00
drcrazy
9fafbf1ed4 Changed TR solar panel to use paneGlass. Closes #1400 2018-01-11 13:55:54 +03:00
drcrazy
161553503b Fix oredict for smallDusts. Closes #1392 2018-01-11 13:31:15 +03:00
modmuss50
2a0a9e5636 Merge remote-tracking branch 'remotes/origin/1.12' into feature-alarm 2018-01-08 17:45:29 +00:00
Dimmerworld
86d37514a7 Recipe for alarm and misc fixes 2018-01-03 15:17:20 +11:00
Modmuss50
cbcb465c97
Added support for individual slot configuration
* start work on slot config

* More slot work

* More gui work for slot config

* Remove old sided code

* More slot work

* More slot memes

* Stuff seems to be working :)

* Start work on auto input / output

* Slot IO check boxes now work

* Fix buttons at different screen resolutions

* Improve close button

* Gui polish

* Fix multiblock hologram rendering

* More fixes + changes

* Cleanup + output fix
2017-12-25 00:18:43 +00:00
drcrazy
1b9844a6cd Made obsidian grindable. 2017-12-19 13:05:57 +03:00
modmuss50
7594b55fb5
Start work on the alarm 2017-12-18 19:58:52 +00:00
drcrazy
328aac0ed2 Make lapis ore grindable to vanilla lapis. 2017-12-18 18:29:00 +03:00
drcrazy
376f02df26 Updated Sawmill GUI and TileEntity. 2017-12-13 12:29:39 +03:00
drcrazy
17f819e9c6 Added charcoal dust grinder recipe. 2017-12-08 20:25:25 +03:00
drcrazy
a419189926 Added dust->ingot<->block recipes for several materials. Closes #1356 2017-12-08 16:43:04 +03:00
drcrazy
b2d2be24c6 Updated recipies and fixed build 2017-11-30 16:46:11 +03:00
drcrazy
eab088c094 Merge branch '1.12' into feature/solar-panles
Conflicts:
	build.gradle
	src/main/java/techreborn/blocks/generator/BlockSolarPanel.java
	src/main/java/techreborn/blocks/lighting/BlockLamp.java
2017-11-28 17:28:47 +03:00
modmuss50
3afe2c8910 Add lang names for new lights 2017-11-28 15:37:34 +03:00
Alistair Buxton
642e6b0f2b Implement powered lighting. 2017-11-28 15:37:32 +03:00
drcrazy
9d1e64b1b2 Fixed texture error for fluid itemblocks. 2017-11-13 02:14:44 +03:00
drcrazy
bf5b649fc4 Removed unused code, added Override annotation 2017-11-12 12:15:32 +03:00
drcrazy
5f2ddec821 Un-oredicted frame for grinder recipe. Closes #1331 2017-11-08 02:05:07 +03:00
modmuss50
d004ceef0e
Add lang names for new lights 2017-11-05 12:04:22 +00:00
Alistair Buxton
c6ac9110fe Implement powered lighting. 2017-11-04 07:31:07 +00:00
Dimmerworld
c651363b73 Update to latest commit(Master) 2017-10-27 09:34:47 +03:00
drcrazy
bae5f73d85 Refactored smelting recipes init. 2017-10-24 18:14:01 +03:00
drcrazy
57151a6f67 Brought back upgrades recipes in IC2 dedup mode. Closes #1302 2017-10-24 12:21:10 +03:00
drcrazy
7d7340111d Added Distillation tower. Closes #884 2017-10-16 15:52:10 +03:00
drcrazy
47134cf2ab Added plasma generator. Some work on #884 2017-10-13 03:20:34 +03:00
modmuss50
46f011ef69 Remove upgrades from the dedupe list, fixes #1302 2017-10-12 21:55:41 +01:00
modmuss50
45d2df8650 Fix #1293 again 2017-10-09 13:23:41 +01:00
modmuss50
62366c8085
Fixes #1293 2017-10-08 18:58:00 +01:00
Dimmerworld
28010d0790 Make scrapboxinator great again!
Fix input/output
Greatly reduced process time
Removed any sign of upgrades
Remove WIP tag
Add crafting recipe 
Cleaned up unused imports

Recipe:
(ironplate|circuit|ironplate)
(dirt|scrapbox|dirt)
(ironplate|circuit|ironplate)
2017-10-04 21:02:51 +11:00
drcrazy
0ae99ebae8 Keep state for running reactor. Closes #1187 2017-10-02 18:38:47 +03:00
drcrazy
1b4fee595d Fixed warnings 2017-09-30 03:58:01 +03:00
drcrazy
b10459a288 Updated Diesel generator recipes. Closes #1279 2017-09-30 03:03:55 +03:00
drcrazy
4ce046a2ac Added recipe for DragonEgg Syphon 2017-09-29 01:08:31 +03:00
drcrazy
cd7b008430 Fixed missing ender eye and pearl grinder recipes 2017-09-17 21:00:15 +03:00
drcrazy
ab1802ba5e Refactoring for translation 2017-09-08 02:03:35 +03:00
drcrazy
30ee947c22 Added player detector recipe. Removed unused imports 2017-09-07 03:17:40 +03:00
drcrazy
015fd889f2 More luv to computer cube block 2017-09-07 01:04:20 +03:00
drcrazy
8588a40474 Added plateIridiumAlloy. Closes #1262. Closes #1073 2017-09-06 02:38:07 +03:00
drcrazy
71a0ac3e66 Updated recipe to use or not use oreDict names. Closes #1210 2017-09-05 23:40:40 +03:00
drcrazy
48c9371d77 Added missing cell recipes. Closes #867 2017-09-05 15:32:43 +03:00
drcrazy
021a6b0077 Fix for name format. Closes #1258 2017-09-01 18:40:33 +03:00