modmuss50
af54caf4bf
Merge remote-tracking branch 'origin/1.12' into 1.12
2017-12-28 14:40:44 +00:00
modmuss50
3b69a1a143
Added the ability to filter inputs on a slot so it only accepts valid items
2017-12-28 14:40:19 +00:00
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
modmuss50
fbd31e1177
More gui fixes for slots
2017-12-28 14:01:33 +00:00
modmuss50
04b4fa2b88
Fix tank rendering over slot config popup
2017-12-28 13:46:33 +00:00
drcrazy
7dfc8e41c3
Very-very light change in cross colors.
2017-12-28 14:43:50 +03:00
drcrazy
f18adc9c0a
Fixed texture issue in JEI.
2017-12-28 02:05:13 +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
Dimmerworld
e93451b595
Woop woop - Alarm work ( #1380 )
...
* Alarm makeover
Model,
boundrybox,
textures,
name localization for the alarm
* Actual translations for Alarm
* Texture resize
As requested
(Didn't notice dimensions when I was grabbing off Prospector)
2017-12-26 01:30:36 +00:00
modmuss50
406e44cbfe
#alphaBuild
2017-12-25 00:26:40 +00:00
modmuss50
510697c021
Fix #1378
2017-12-25 00:25:11 +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
a59647a0b7
Merge pull request #1379 from InterPlay02/1.12
...
Fixed one single word
2017-12-23 22:13:45 +00:00
drcrazy
05884b2fda
Fix issue with chainsaw cutting speed. Closes #1376
2017-12-23 00:28:53 +03:00
InterPlay
91ee4e722d
Fixed one single word
2017-12-22 12:32:24 -02:00
modmuss50
b9084d620e
#releaseBuild
2017-12-22 13:15:00 +00:00
modmuss50
15d24d3840
Update libs
2017-12-22 13:14:00 +00:00
modmuss50
5a40749bcd
Fixed #1364
2017-12-22 12:51:16 +00:00
modmuss50
623983f20a
Merge remote-tracking branch 'origin/1.12' into 1.12
2017-12-19 23:50:52 +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
drcrazy
1b9844a6cd
Made obsidian grindable.
2017-12-19 13:05:57 +03:00
Modmuss50
8b90bc6a60
Merge pull request #1373 from DYColdWind/zh_cn.lang
...
zh_cn.lang
2017-12-19 09:44:51 +00:00
冷风
a4b6f81178
Update zh_cn.lang
2017-12-19 13:49:40 +08:00
冷风
ec1be6b639
Update zh_cn.lang
2017-12-19 13:48:50 +08:00
modmuss50
7594b55fb5
Start work on the alarm
2017-12-18 19:58:52 +00:00
Modmuss50
3698cf379e
Merge pull request #1372 from InterPlay02/1.12
...
pt-BR Translation
2017-12-18 18:12:12 +00: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
328aac0ed2
Make lapis ore grindable to vanilla lapis.
2017-12-18 18:29:00 +03:00
modmuss50
677bb59ceb
Should hopefully fix server crash #releaseBuild Fixes #1371
2017-12-18 01:48:25 +00:00
modmuss50
5be3163eeb
#releaseBuild
2017-12-17 22:20:28 +00:00
modmuss50
55c5f58c7e
Clocking device now makes the player fully invisible
2017-12-17 22:13:29 +00:00
modmuss50
3c7cd638c1
Make smaller cables have a smaller bounding box
2017-12-17 22:05:14 +00:00
modmuss50
dc4cdbb9cc
Fixes #1368
2017-12-17 21:53:14 +00:00
modmuss50
ee075feea9
Fixes #1359
2017-12-17 21:43:12 +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
dce7e43c4f
Fixed amount for empty cells. Closes #1366
2017-12-16 01:46:34 +03:00
drcrazy
6c7f9078ec
Secondary gem moved to eventHandler. Closes #1365
2017-12-15 16:43:48 +03:00
drcrazy
376f02df26
Updated Sawmill GUI and TileEntity.
2017-12-13 12:29:39 +03:00
modmuss50
33be3cf35d
#releaseBuild
2017-12-11 13:20:40 +00:00
drcrazy
1d18740215
Fixed rotation for solar panels. Closes #1358
2017-12-11 12:03:20 +03:00
drcrazy
17f819e9c6
Added charcoal dust grinder recipe.
2017-12-08 20:25:25 +03:00
drcrazy
a419189926
Added dust->ingot<->block recipes for several materials. Closes #1356
2017-12-08 16:43:04 +03:00
modmuss50
1581ad439c
Revert maven changes
2017-12-06 11:05:22 +00:00
modmuss50
73f1fa9a86
Use older version of ic2 that has been cached, should be reverted at a later date.
2017-12-05 17:37:11 +00:00
modmuss50
696e6a9626
Use mod maven to proxy around ic2 maven being down.
2017-12-05 17:32:55 +00:00
