Modmuss50
ff1dc294df
Merge pull request #1388 from InterPlay02/1.12
...
(pt-BR) Updated to match the new en_us.lang file
2017-12-28 14:31:45 +00:00
InterPlay
75f01ee507
Updated to match the new en_us.lang file (pt-BR)
2017-12-28 12:29:32 -02:00
modmuss50
751746df6f
Allow lang files to specify the location of the fluid name, closes #1386
2017-12-28 14:19:26 +00:00
drcrazy
7dfc8e41c3
Very-very light change in cross colors.
2017-12-28 14:43:50 +03:00
InterPlay
61429dc15e
Fixed a wrong placement of signals ( #1385 )
2017-12-27 22:30:43 +00:00
InterPlay
77b8b75302
Fixed a wrong placement of signals
2017-12-27 20:11:59 -02: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
a59647a0b7
Merge pull request #1379 from InterPlay02/1.12
...
Fixed one single word
2017-12-23 22:13:45 +00:00
InterPlay
91ee4e722d
Fixed one single word
2017-12-22 12:32:24 -02:00
冷风
ec1be6b639
Update zh_cn.lang
2017-12-19 13:48:50 +08:00
InterPlay
2815bc84d4
Just fixed a single word
2017-12-18 16:09:39 -02:00
InterPlay
1909d426e3
Uploaded pt-BR.lang File
2017-12-18 16:08:00 -02:00
drcrazy
a419189926
Added dust->ingot<->block recipes for several materials. Closes #1356
2017-12-08 16:43:04 +03:00
冷风
e8d6009e83
Update zh_cn.lang
2017-12-02 08:26:48 +08:00
Dimmerworld
3c68417fd9
Item liquidation ( #1347 )
...
We salute our brace comrades:
Solar panel
Compact solar panel
and Quantum singularity
Whom wern't quite ready to be implemented.
2017-12-01 17:16:39 +03:00
drcrazy
9ac8b31599
Fixed TOP\Waila icon for active machine
2017-11-29 15:23:40 +03: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
drcrazy
703f49752e
Updated top texture for solar panels
2017-11-28 16:52:14 +03:00
modmuss50
3afe2c8910
Add lang names for new lights
2017-11-28 15:37:34 +03:00
Alistair Buxton
642e6b0f2b
Implement powered lighting.
2017-11-28 15:37:32 +03:00
冷风
1f224277e5
zh_cn.lang ( #1341 )
...
* Update zh_cn.lang
* Update zh_cn.lang
* Update zh_cn.lang
2017-11-18 12:02:46 +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
41dd0468e6
Fixed CTM version of LESU Storage.
2017-11-10 01:21:59 +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
e0edff6891
Some more work on solar panels.
2017-10-27 09:40:10 +03:00
Dimmerworld
63def52526
Hybrid texture top fix
2017-10-27 09:34:59 +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
c4711848ae
Textures and block work.
2017-10-27 09:34:49 +03:00
Dimmerworld
c651363b73
Update to latest commit(Master)
2017-10-27 09:34:47 +03:00
drcrazy
26ddc03a65
Added background icon for upgrade slots
2017-10-21 02:07:06 +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
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
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
47134cf2ab
Added plasma generator. Some work on #884
2017-10-13 03:20:34 +03:00
modmuss50
c80cc0101f
Allow changing of the power cost view in fusion reactor recipes.
2017-10-11 12:56:29 +01:00
drcrazy
58aac2ce0b
Updated AESU GUI
2017-10-10 00:13:08 +03: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
drcrazy
6f96dd7c2b
Renamed files to fix startup messages
2017-09-29 02:22:05 +03:00
drcrazy
7cc8a4985f
Fix plate iridium alloy name. Closes #1271
2017-09-11 23:15:59 +03:00