Commit graph

3193 commits

Author SHA1 Message Date
modmuss50
a26d11ee51 Fix small issue with TOP support. 2017-10-13 11:07:18 +01:00
drcrazy
47134cf2ab Added plasma generator. Some work on #884 2017-10-13 03:20:34 +03:00
modmuss50
709922b708 #releaseBuild 2017-10-12 22:28:32 +01:00
modmuss50
eb6098de5d Re-enable retro gen support (beta), let me know of any issues. Closes #1162 2017-10-12 22:12:09 +01:00
modmuss50
09969559e8 Add fluid gen support to CT, closes #1153 2017-10-12 22:10:41 +01:00
modmuss50
46f011ef69 Remove upgrades from the dedupe list, fixes #1302 2017-10-12 21:55:41 +01:00
modmuss50
31f3aff11f Remove ghost upgrade slots on some machines. 2017-10-12 21:51:07 +01:00
modmuss50
79984ab107 Fixes #1295 2017-10-12 21:32:53 +01:00
modmuss50
e490669405 Fixes CraftTweaker support, closes #1303 2017-10-12 21:19:51 +01:00
modmuss50
b7b9cb9963 Merge remote-tracking branch 'origin/1.12' into 1.12 2017-10-12 17:50:13 +01:00
modmuss50
984e9eb2f2 Improve TOP support 2017-10-12 17:50:03 +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
f5e73d23fa #releaseBuild 2017-10-11 17:43:45 +01:00
modmuss50
fd5af79496 Merge remote-tracking branch 'origin/1.12' into 1.12 2017-10-11 17:42:36 +01:00
modmuss50
23ccd878bd Fix rolling machine CT 2017-10-11 17:42:27 +01:00
drcrazy
ae27bf7b9f Added multiblock hologram to Vacuum Freezer. Closes #1297 2017-10-11 17:24:36 +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
3945a961ef Replaced direct FMLLog usage with LogHelper 2017-10-11 10:40:45 +03:00
drcrazy
387d4287de Fixed warnings for VersionChecker by removing it ) 2017-10-11 02:07:08 +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
45d2df8650 Fix #1293 again 2017-10-09 13:23:41 +01:00
modmuss50
b990a7aaa9
#releaseBuild 2017-10-08 20:00:11 +01:00
modmuss50
18be69aaf7
Improve tank server->client syncing, closes https://github.com/TechReborn/TechReborn/issues/1291 2017-10-08 19:28:52 +01:00
modmuss50
62366c8085
Fixes #1293 2017-10-08 18:58:00 +01:00
modmuss50
a590fd8ee1
Should fix #1289 2017-10-08 18:56:07 +01:00
modmuss50
790aa6f826
Update forge 2017-10-08 18:54:59 +01:00
drcrazy
1177b693f7 Fixed IDSU not charging items 2017-10-08 02:41:54 +03:00
drcrazy
350d3589c9 Fix warnings for subitemtype instead of supressing it 2017-10-08 01:59:28 +03:00
drcrazy
ca829c18cc Added wrench support 2017-10-08 00:04:08 +03:00
drcrazy
12e2cbe11b Fixed textformatting warnings 2017-10-07 14:39:30 +03:00
modmuss50
a80409c138 Some small tweaks to the auto crafting table, closes #1286 2017-10-04 15:19:45 +01:00
modmuss50
4e536718a3 Large changes to allow the Electrical Furnace to be upgraded 2017-10-04 13:35:58 +01:00
Modmuss50
db636be12c Merge pull request #1285 from Dimmerworld/Scrapboxinator
Made Scrapboxinator functional to an extent
2017-10-04 11:07:10 +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
modmuss50
965d74d641 Improvements to the iron furnace, closes #1016 2017-10-04 10:12:15 +01:00
Dimmerworld
4c1d011544 Made Scrapboxinator functional to a extent
Fix progressbar flicker(Major one)
Opens the scrapbox now and has a vaild output
2017-10-04 15:37:09 +11:00
modmuss50
e5e05d0afd Chainsaw chops down the entire tree 2017-10-03 17:39:33 +01:00
modmuss50
3481cf4dba Merge remote-tracking branch 'origin/1.12' into 1.12 2017-10-03 17:03:08 +01:00
modmuss50
f00214f7de Rewrite item power distribution to support fe. should fix #1260 2017-10-03 17:02:58 +01:00
Modmuss50
e80583a1e7 Update forge 2017-10-03 15:52:20 +01:00
modmuss50
81264e0fe2 Add back cable damage, closes #1150 2017-10-03 13:24:51 +01:00