Commit graph

814 commits

Author SHA1 Message Date
modmuss50
d94eb03a06 Update Fusion reactor to use new method for coil location. 2018-04-18 14:48:19 +01:00
modmuss50
3805285356
Fix #1484 2018-04-14 00:18:13 +01:00
drcrazy
883638117b Decreased amount of energy required to make UU-matter. 2018-04-13 18:27:46 +03:00
modmuss50
ec30ac8e6c
Fixes https://github.com/TechReborn/TechReborn/issues/1476 2018-04-12 14:23:07 +01:00
modmuss50
b8514a998f
Add some missing RebornRegistry annoations 2018-04-12 13:57:29 +01:00
drcrazy
fef10740ba
Feature/fluidreplicator (#1482)
Added Fluid Replicator multiblock machine.
2018-04-12 15:42:12 +03:00
modmuss50
e171aedd38
Allow upgrades in rollingmachine 2018-04-10 16:04:28 +01:00
modmuss50
1582d419df
Fix Recycler using power when output full, and made it upgradeable 2018-04-10 10:51:10 +01:00
modmuss50
7deb407d0a
Fixed electrical furnace not using the correct amount of power when overclocked 2018-04-07 20:31:05 +01:00
modmuss50
d50b3daf6e
Allow charge bench to store more power 2018-04-07 20:26:28 +01:00
modmuss50
0bf602f89e
Change the way the rolling machine balances itemstacks 2018-04-07 20:22:42 +01:00
modmuss50
9a566e0583
Fix fluid generator client/server desync, fixes #1474 2018-04-05 16:09:17 +01:00
modmuss50
ec56914ea7
Add logic to lock rolling machine, allows it to be automated. Closes #1412 2018-04-05 12:37:31 +01:00
modmuss50
c17f232bf8
Add gui and packets for locking the rolling machine. #1412 2018-04-05 10:31:22 +01:00
modmuss50
cf58eb2948
Increase blast furnace energy storage 2018-04-03 18:23:21 +01:00
modmuss50
adb12ef43d
Overclocker upgrades give more power input/storage to machine + add some more info to the tool tip in the gui
Also fix for not calling update client side lower down the chain
2018-04-03 16:32:04 +01:00
modmuss50
fc9e7df2f9
Fix machine teirs 2018-04-02 22:31:26 +01:00
modmuss50
aaa0121e7c
Merge remote-tracking branch 'origin/1.12' into 1.12 2018-04-02 22:28:39 +01:00
modmuss50
ea6e068682
Protect against tiles that return a null capability 2018-04-02 22:28:14 +01:00
drcrazy
45361a6b46 Last piece of refactoring due to TileGenericMachine intro. 2018-04-02 18:12:58 +03:00
drcrazy
adc4879ec5 Refactoring for multi-block machines. 2018-04-02 17:50:15 +03:00
drcrazy
54ee781bc7 More refactoring for tier1 machines. 2018-04-02 16:58:03 +03:00
drcrazy
80e36f0427 Fixed typos for tier1 tiles folder. New abstract TR machine class 2018-04-02 16:18:48 +03:00
drcrazy
f5b0670d84 Cleanup for energy storage 2018-04-02 14:56:17 +03:00
drcrazy
8038a7cf17 Cleaned up unused ITickable for transformers 2018-04-02 14:44:32 +03:00
drcrazy
d563ff748a Cleanup and configs. Closes #1469 2018-04-01 00:39:58 +03:00
drcrazy
799386b872 Added configs. Some work on #1469 2018-03-30 17:34:32 +03:00
modmuss50
b5ad12a4bb
Update rolling machine to use new gui system. Work towards #1412 2018-03-29 11:52:57 +01:00
modmuss50
8886331f8b
Increase electrolyser energy storage 2018-03-26 15:53:03 +01:00
drcrazy
67fab7cdf2 Fixed deprecation warning. 2018-03-23 12:05:22 +03: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
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
c5d162c527 Fixed GUI progress for fluid generators. Some work on #1430 2018-02-13 14:27:31 +03:00
drcrazy
2f7ce0f563 Limited Centrifuge bottom slot to cells only. 2018-02-13 01:56:18 +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
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
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