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 |
|
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
|
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 |
|
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
|
150fb2a2c4
|
Fixed iron furnace fuel slot shift-click in ugly way. Closes #968
|
2017-11-13 13:46:20 +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
|
5bfe649360
|
Added coils check in onLoad. Closes #1337
|
2017-11-08 03:16:51 +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 |
|
Alistair Buxton
|
c6ac9110fe
|
Implement powered lighting.
|
2017-11-04 07:31:07 +00:00 |
|
modmuss50
|
c0fc388a01
|
I tried to fix item rendering issues, but failed.
|
2017-10-27 09:40:11 +03:00 |
|
modmuss50
|
e0edff6891
|
Some more work on solar panels.
|
2017-10-27 09:40:10 +03:00 |
|
modmuss50
|
0aa8974035
|
Fix some issues with the solar panels
|
2017-10-27 09:40:09 +03:00 |
|
Dimmerworld
|
3fe609e207
|
Fix poweroutput
|
2017-10-27 09:40:08 +03:00 |
|
Dimmerworld
|
9972822acd
|
Drcrazy fixes
|
2017-10-27 09:40:07 +03:00 |
|
drcrazy
|
c7f599ead1
|
Merge with upstream
|
2017-10-27 09:39:31 +03:00 |
|
Dimmerworld
|
60426c4cc1
|
canSeeSky reduced to every 20 ticks @Modmuss request
|
2017-10-27 09:35:02 +03:00 |
|
Dimmerworld
|
37de6f6a6d
|
Justifications
|
2017-10-27 09:35:01 +03:00 |
|
Dimmerworld
|
d4c941cb5a
|
Modmuss50 changes
ID removed
Configs removed
Private Enum buffer removed
|
2017-10-27 09:35:00 +03:00 |
|
Dimmerworld
|
5396551891
|
Revert "Update to latest commit(Master)"
|
2017-10-27 09:34:58 +03:00 |
|
Dimmerworld
|
8a5df0fc4b
|
Texture readd, classes unaltered and debug message removed
|
2017-10-27 09:34:57 +03:00 |
|
Dimmerworld
|
5d0b5c3ea3
|
Balance, textures and items
|
2017-10-27 09:34:55 +03:00 |
|
Dimmerworld
|
4205beaead
|
Balance and null fix
|
2017-10-27 09:34:54 +03:00 |
|
Dimmerworld
|
74b8246b39
|
More work on tile entity
|
2017-10-27 09:34:51 +03:00 |
|
Dimmerworld
|
fed439307e
|
Tile entity work
|
2017-10-27 09:34:50 +03:00 |
|
Dimmerworld
|
c4711848ae
|
Textures and block work.
|
2017-10-27 09:34:49 +03:00 |
|
Dimmerworld
|
c651363b73
|
Update to latest commit(Master)
|
2017-10-27 09:34:47 +03:00 |
|
drcrazy
|
c8b6edd390
|
Updated LESU. Closes #1322
|
2017-10-26 02:26:07 +03:00 |
|
drcrazy
|
440c089b5f
|
Fixed scrapbox list of outputs. Closes #1317. I hope )
|
2017-10-24 15:09:53 +03:00 |
|
modmuss50
|
3901d60545
|
Some work on charging ic2 items, moving back to a proper pc.
|
2017-10-22 18:23:58 +01: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
|
31f3aff11f
|
Remove ghost upgrade slots on some machines.
|
2017-10-12 21:51:07 +01:00 |
|
drcrazy
|
416361ff3b
|
Increased internal buffer for cable to x6 of transfer rate. Closes #1296
|
2017-10-12 18:23:50 +03:00 |
|
drcrazy
|
b80bf1240d
|
Updated cable to push energy to other cables. Closes #1296
|
2017-10-12 02:05:20 +03:00 |
|
modmuss50
|
610c2e479e
|
Small tile cleanup + small fixes for potential issues.
|
2017-10-11 13:04:09 +01:00 |
|
modmuss50
|
c80cc0101f
|
Allow changing of the power cost view in fusion reactor recipes.
|
2017-10-11 12:56:29 +01:00 |
|
modmuss50
|
55b09da681
|
Fix fusion reactor not using its starting power.
|
2017-10-11 12:44:42 +01:00 |
|
drcrazy
|
79c66e2349
|
Suppressed warning for old upgrade slots
|
2017-10-11 11:28:04 +03:00 |
|
drcrazy
|
5d38337caa
|
Fixed unused variable warning
|
2017-10-11 11:20:42 +03:00 |
|
drcrazy
|
751be69426
|
Fixed warnings for IronAlloyFurnace (checkBurningTime, updateEntity)
|
2017-10-11 11:18:42 +03:00 |
|
drcrazy
|
5961ce5961
|
Fixed warning by hasContainerItem()
|
2017-10-11 10:52:12 +03:00 |
|
drcrazy
|
8692bef2bb
|
Little polish to AESU GUI
|
2017-10-11 01:59:25 +03:00 |
|
drcrazy
|
e81fc202ad
|
Added AESU logic
|
2017-10-11 00:49:12 +03:00 |
|
drcrazy
|
58aac2ce0b
|
Updated AESU GUI
|
2017-10-10 00:13:08 +03:00 |
|
modmuss50
|
18be69aaf7
|
Improve tank server->client syncing, closes https://github.com/TechReborn/TechReborn/issues/1291
|
2017-10-08 19:28:52 +01:00 |
|
drcrazy
|
1177b693f7
|
Fixed IDSU not charging items
|
2017-10-08 02:41:54 +03:00 |
|