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
modmuss50
0b8f139e6d
Add a config to lock the rolling machine recipe + some optimisations #1412
2018-01-31 13:47:48 +00:00
modmuss50
34816e5ee7
Fixes #1425
2018-01-31 10:09:39 +00:00
modmuss50
9cd916f9ce
Fix duplicate config key name
2018-01-30 22:10:35 +00:00
drcrazy
a6df9441ec
Updated reactor GUI. Closes #1422
2018-01-29 18:17:32 +03:00
drcrazy
73b2f36b24
Fixes for wrenching blocks. Closes #1417 and #1418
2018-01-26 12:27:58 +03:00
drcrazy
79582cd94b
Fill\drain fluidgen tank only on server
2018-01-21 02:16:51 +03:00
modmuss50
677fa7765c
Update old tank syncing code, fixes TechReborn/TechReborn/issues/1377
2018-01-20 16:16:56 +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
modmuss50
1bfb5d5604
Fix crash with Fusion Control computer, fixes part of #1395
2018-01-12 19:51:06 +00:00
drcrazy
4332e8852f
TR part for #1402 done. RC to go.
2018-01-10 15:57:58 +03:00
modmuss50
268a16958b
Format + license headers.
2018-01-08 18:29:12 +00: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
Dimmerworld
2177b72e41
Animation
2018-01-03 14:26:23 +11:00
modmuss50
3e8cf290bf
Fixes crash with auto crafting table.
2017-12-29 17:09:19 +00:00
modmuss50
9ff30a4344
Add support for charging FE based items
2017-12-28 14:53:56 +00: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
modmuss50
5a40749bcd
Fixed #1364
2017-12-22 12:51:16 +00:00
modmuss50
7ab59db7c0
Improve idle auto crafting table tick time, more work still needs to be done. Closes #1374
2017-12-19 23:50:38 +00:00
modmuss50
7594b55fb5
Start work on the alarm
2017-12-18 19:58:52 +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
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
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
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
modmuss50
4d043faa27
Fixes #1344
2017-11-29 09:35:00 +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
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