Commit graph

2501 commits

Author SHA1 Message Date
modmuss50
3c7cd638c1
Make smaller cables have a smaller bounding box 2017-12-17 22:05:14 +00:00
modmuss50
dc4cdbb9cc
Fixes #1368 2017-12-17 21:53:14 +00:00
modmuss50
ee075feea9
Fixes #1359 2017-12-17 21:43:12 +00:00
modmuss50
7f289e2356
Add ic2 item discharge support, closes #1357 2017-12-17 21:36:48 +00:00
modmuss50
82eb0f62d6
Fixes #1354 2017-12-17 21:24:25 +00:00
drcrazy
dce7e43c4f Fixed amount for empty cells. Closes #1366 2017-12-16 01:46:34 +03:00
drcrazy
6c7f9078ec Secondary gem moved to eventHandler. Closes #1365 2017-12-15 16:43:48 +03:00
drcrazy
376f02df26 Updated Sawmill GUI and TileEntity. 2017-12-13 12:29:39 +03:00
drcrazy
1d18740215 Fixed rotation for solar panels. Closes #1358 2017-12-11 12:03:20 +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
modmuss50
53c731d678 Handful of improvements to the electrical furnace, closes #1349 2017-12-04 20:55:57 +00:00
drcrazy
777707373a Fixed cells piping into Industrial Grinder. 2017-12-04 23:10:33 +03:00
drcrazy
2f54305f6d Added filter for fluidSlot. Closes #1352 2017-12-04 22:34:34 +03:00
drcrazy
df24adb936 Made solar panel wrenchable 2017-12-01 19:24:02 +03:00
drcrazy
6202b46cf7 Fixed unused imports 2017-12-01 19:04:30 +03:00
Dimmerworld
3c68417fd9 Item liquidation (#1347)
We salute our brace comrades:

Solar panel
Compact solar panel
and Quantum singularity

Whom wern't quite ready to be implemented.
2017-12-01 17:16:39 +03:00
drcrazy
b2d2be24c6 Updated recipies and fixed build 2017-11-30 16:46:11 +03:00
drcrazy
f6fca1c623 Merge branch '1.12' of https://github.com/TechReborn/TechReborn.git into feature/solar-panles 2017-11-29 17:13:36 +03:00
drcrazy
9ac8b31599 Fixed TOP\Waila icon for active machine 2017-11-29 15:23:40 +03:00
modmuss50
4d043faa27 Fixes #1344 2017-11-29 09:35:00 +00:00
modmuss50
2603fa5df7 Merge remote-tracking branch 'origin/1.12' into 1.12 2017-11-28 17:44:18 +00:00
modmuss50
b8964b6eca Update mappings 2017-11-28 17:25:36 +00: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
drcrazy
be227b4edb Fixed type in zenclass name. Closes #1332 2017-11-28 15:37:38 +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
34913c4817 Added config for several multiblock machines. 2017-11-28 15:23:32 +03:00
drcrazy
9a8a7455ff Fixed warning for FusionReactorRecipeWrapper 2017-11-27 17:58:37 +03:00
drcrazy
779551cf70 Fixed JavaDoc and CTScrapbox warnings 2017-11-27 17:55:29 +03:00
modmuss50
e2f177b757 Can now charge ic2 items, closes #1202 2017-11-27 13:34:45 +00:00
drcrazy
bff9179734 Updated multiblock to use BlockPos rather than CoordTriplet 2017-11-25 03:30:58 +03:00
modmuss50
9aa3d3e59d Added back buildcraft support 2017-11-24 14:59:49 +00:00
modmuss50
def8cb5355
Fix dupe bug, Fixes https://github.com/TechReborn/TechReborn/issues/1342 2017-11-18 20:37:14 +00:00
drcrazy
64495919c0 Added config for transformers to follow IC2 style. Closes #1326 2017-11-14 14:34:14 +03:00
drcrazy
ffe115bee1 Fixed iridium oregen. Closes #1330 2017-11-13 18:29:16 +03:00
drcrazy
150fb2a2c4 Fixed iron furnace fuel slot shift-click in ugly way. Closes #968 2017-11-13 13:46:20 +03:00
drcrazy
53c8033a99 Fixed duplicate registration for basic machine frame. Closes #1340 2017-11-13 11:47:15 +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
3d623292f8 Fixed more warnings 2017-11-10 12:48:01 +03:00
drcrazy
25d561c81c Fixed imports and suppressed recipe warnings. 2017-11-10 12:27:31 +03:00
drcrazy
29d1176861 Fixed casing model with CTM enabled 2017-11-10 01:29:08 +03:00
drcrazy
41dd0468e6 Fixed CTM version of LESU Storage. 2017-11-10 01:21:59 +03:00
drcrazy
5bfe649360 Added coils check in onLoad. Closes #1337 2017-11-08 03:16:51 +03:00
drcrazy
5f2ddec821 Un-oredicted frame for grinder recipe. Closes #1331 2017-11-08 02:05:07 +03:00
drcrazy
8cacd3d8d1 Limited LESU max storage to MAX_INT FE or MAX_INT/4 EU. Closes #1328 2017-11-08 01:48:11 +03:00
drcrazy
2ff9b6950d Fixed type in zenclass name. Closes #1332 2017-11-05 23:49:11 +03:00
modmuss50
d004ceef0e
Add lang names for new lights 2017-11-05 12:04:22 +00:00
drcrazy
19ccbd681d Fixed itemBlock rendering. TOP\Waila are still an issue 2017-11-05 02:32:06 +03:00