Commit graph

3142 commits

Author SHA1 Message Date
Modmuss50
8a114d53ad #releaseBuild 2017-11-28 15:37:25 +03:00
drcrazy
19ccbd681d Fixed itemBlock rendering. TOP\Waila are still an issue 2017-11-05 02:32:06 +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
Modmuss50
4d370f2264 Merge pull request #1311 from ali1234/fixes
Don't place a block when opening energy store GUI.
2017-10-17 09:15:07 +02: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