Commit graph

2728 commits

Author SHA1 Message Date
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
Alistair Buxton
c6ac9110fe Implement powered lighting. 2017-11-04 07:31:07 +00:00
drcrazy
18fed6b237 Fixed #texture start up error 2017-10-30 23:18:03 +03:00
drcrazy
047507f4fc Fixed error message about #texture 2017-10-29 02:44:04 +03:00
modmuss50
2f52171a04 Still didnt fix it ;( 2017-10-27 09:40:12 +03: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
63def52526 Hybrid texture top fix 2017-10-27 09:34:59 +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
4307cb8258 misc fixes 2017-10-27 09:34:56 +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
9855cce93d Upgrade merge 2017-10-27 09:34:53 +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
d3ede81de4 alter 2017-10-27 09:34:48 +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
bae5f73d85 Refactored smelting recipes init. 2017-10-24 18:14:01 +03:00
drcrazy
440c089b5f Fixed scrapbox list of outputs. Closes #1317. I hope ) 2017-10-24 15:09:53 +03:00
drcrazy
57151a6f67 Brought back upgrades recipes in IC2 dedup mode. Closes #1302 2017-10-24 12:21:10 +03:00
drcrazy
5974ae094d Added icons for armor slots in MFE\MFSU\etc. 2017-10-23 18:18:25 +03:00
drcrazy
c0a43c0947 Icons for armor slots 2017-10-23 16:02:58 +03:00
modmuss50
3901d60545 Some work on charging ic2 items, moving back to a proper pc. 2017-10-22 18:23:58 +01:00
modmuss50
1c6336eb68 Add grinder support to CT, closes https://github.com/TechReborn/TechReborn/issues/1318 2017-10-22 18:12:31 +01:00
drcrazy
26ddc03a65 Added background icon for upgrade slots 2017-10-21 02:07:06 +03:00
drcrazy
a57c09f633 Added ability to remove single\all scrapbox outputs. Closes #1305 2017-10-20 23:09:05 +03:00
drcrazy
30090b53dc Small fixes to ru_ru translation 2017-10-20 12:16:58 +03:00
SkyFire55
7e4f2ebc6c Russian language support update (#1315)
* Russian language support update

* Different translation fixes
2017-10-20 12:09:45 +03:00
drcrazy
5702e79e7a Do net reset block break progress upon item charge. Closes #1312 2017-10-20 03:00:28 +03:00
drcrazy
441ac4887a Made Cloaking device wearable in 1.12. Closes #1314 2017-10-20 01:58:35 +03:00
drcrazy
3f1e7b9111 Fixed transformer upgrade name. Closes #1313 2017-10-19 12:20:56 +03:00
Alistair Buxton
e43a4dbf3c Don't place a block when opening energy store GUI. 2017-10-17 07:25:20 +01:00
drcrazy
7d7340111d Added Distillation tower. Closes #884 2017-10-16 15:52:10 +03:00
drcrazy
4c8a9fb7e8 Textures for solar panels 2017-10-16 01:49:05 +03:00
drcrazy
c4916f5c7e Fixed model loading errors for sapling and plates 2017-10-15 02:00:13 +03:00
drcrazy
7b4178eba8 Fixed sapling startup error message 2017-10-13 18:20:04 +03:00
drcrazy
2fd8df2118 Added CT support for plasma generator 2017-10-13 17:41:29 +03:00
drcrazy
ae1dfe4e45 Fixed warning related to deprecated JEI compat. 2017-10-13 13:31:11 +03:00
modmuss50
62251e7842 Merge remote-tracking branch 'origin/1.12' into 1.12 2017-10-13 11:07:26 +01:00
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
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
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
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
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
f00214f7de Rewrite item power distribution to support fe. should fix #1260 2017-10-03 17:02:58 +01:00
modmuss50
81264e0fe2 Add back cable damage, closes #1150 2017-10-03 13:24:51 +01:00
drcrazy
369a19b239 Updated alloy smelter GUI to use guiBase 2017-10-03 14:44:08 +03:00
drcrazy
08c2f8921e Add ability to insert\extract from fusion reactor. Closes #1237 2017-10-02 21:08:05 +03:00
drcrazy
0ae99ebae8 Keep state for running reactor. Closes #1187 2017-10-02 18:38:47 +03:00
drcrazy
1c57bd0100 MOre fixed warnings 2017-10-01 03:15:58 +03:00
drcrazy
1c95ca4967 Fixed warnings for Location and getStateFromMeta 2017-10-01 03:03:05 +03:00