modmuss50
8a4aafb042
Add some missing configs + small cleanup
2018-01-30 23:32:45 +00:00
modmuss50
7f26541237
Add config gui
...
Remove unused config
2018-01-30 23:20:21 +00:00
modmuss50
9cd916f9ce
Fix duplicate config key name
2018-01-30 22:10:35 +00:00
drcrazy
a6df9441ec
Updated reactor GUI. Closes #1422
2018-01-29 18:17:32 +03:00
modmuss50
2e115242a2
Might fix #1421
2018-01-29 13:14:46 +00:00
drcrazy
73b2f36b24
Fixes for wrenching blocks. Closes #1417 and #1418
2018-01-26 12:27:58 +03:00
drcrazy
79582cd94b
Fill\drain fluidgen tank only on server
2018-01-21 02:16:51 +03:00
modmuss50
2cb5645806
Fixes #1399
2018-01-20 16:27:50 +00:00
modmuss50
677fa7765c
Update old tank syncing code, fixes TechReborn/TechReborn/issues/1377
2018-01-20 16:16:56 +00:00
drcrazy
e4736447bd
RecipeCrafter for scrapboxinator
2018-01-19 18:08:27 +03:00
drcrazy
44b6f20357
Updated scrapboxinator to crafter and new GUI.
2018-01-19 18:07:52 +03:00
modmuss50
e0eb725878
Fix crash when codechicken lib isn't installed. #releaseBuild
2018-01-19 11:19:53 +00:00
drcrazy
c69b9f46b6
Added ability to remove fluidgenerator recipe via CT. Closes #1404
2018-01-19 11:17:36 +03:00
temp1011
91a56077d8
Work on Advanced Drill ( #1411 )
...
* Raytracing for drill
* Stop crashes if raytrace is somehow null
* getCount() already checks for emptiness I think
2018-01-19 10:07:40 +03:00
drcrazy
8e12543902
Fixed RemoveAll in CraftTweaker. Closes #1410
2018-01-17 15:39:41 +03:00
drcrazy
ca9508c381
Deprecated ScrapboxList.
2018-01-17 13:57:40 +03:00
drcrazy
4fc45221a2
Removed scrapboxlist usage. Closes #1407
2018-01-17 13:53:25 +03:00
modmuss50
1bfb5d5604
Fix crash with Fusion Control computer, fixes part of #1395
2018-01-12 19:51:06 +00:00
modmuss50
819e3a5ee1
Add a null check for RayTraceResult may fix #1393
2018-01-12 19:48:41 +00:00
drcrazy
52e1fb2dc9
Fixed compressor recipe for lapis. Second point from #1396
2018-01-12 18:48:09 +03:00
drcrazy
af755a9f6e
Changed carbon fiver recipe to shaped. Closes #1394
2018-01-12 01:13:44 +03:00
drcrazy
27b1535242
Added oreDict for blockBronze. Closes #1401
2018-01-11 14:53:40 +03:00
drcrazy
9fafbf1ed4
Changed TR solar panel to use paneGlass. Closes #1400
2018-01-11 13:55:54 +03:00
drcrazy
161553503b
Fix oredict for smallDusts. Closes #1392
2018-01-11 13:31:15 +03:00
InterPlay
9de4eb947b
Updated to the newer version coming soon (pt-BR) ( #1408 )
...
* Updated pt-BR translation. Kudos to InterPlay02
2018-01-11 13:13:22 +03:00
drcrazy
4332e8852f
TR part for #1402 done. RC to go.
2018-01-10 15:57:58 +03:00
drcrazy
85cd77e5c1
Some work on #1402 . Teh moar to come.
2018-01-09 17:48:14 +03:00
modmuss50
268a16958b
Format + license headers.
2018-01-08 18:29:12 +00:00
modmuss50
2a0a9e5636
Merge remote-tracking branch 'remotes/origin/1.12' into feature-alarm
2018-01-08 17:45:29 +00:00
Dimmerworld
86d37514a7
Recipe for alarm and misc fixes
2018-01-03 15:17:20 +11:00
Dimmerworld
2177b72e41
Animation
2018-01-03 14:26:23 +11:00
Modmuss50
8d6c595215
Merge pull request #1391 from DYColdWind/patch-1
...
Update zh_cn.lang
2017-12-30 01:58:05 +00:00
冷风
78bc17a721
Update zh_cn.lang
2017-12-30 07:29:27 +08:00
modmuss50
5c16978e4d
Improve it a bit more
2017-12-29 18:15:27 +00:00
modmuss50
1d6c6139ec
Move JEI item pane out of the way if the slot config goes of the side of the screen.
2017-12-29 18:12:04 +00:00
modmuss50
ff2ed99d14
Reimplement JEI show recipes button, so it can be disabled when the slot config is shown.
...
I didnt see a better way to do this, please let me know if you know better.
2017-12-29 17:24:01 +00:00
modmuss50
3e8cf290bf
Fixes crash with auto crafting table.
2017-12-29 17:09:19 +00:00
modmuss50
0b6808013d
Fixes crash with recipe book.
2017-12-29 12:50:10 +00:00
modmuss50
57f3e43ec5
Add removeAll() to all machines in crafttweaker, closes #1389
2017-12-29 12:33:05 +00:00
Dimmerworld
bdc34d673c
Proper faces
2017-12-29 16:50:35 +11:00
冷风
5f4a1be06b
Update zh_cn.lang
2017-12-29 13:26:01 +08:00
modmuss50
602cfebc38
#betaBuild
2017-12-28 15:02:59 +00:00
modmuss50
5b26f36082
Small tweak to config gui
2017-12-28 14:57:52 +00:00
modmuss50
9ff30a4344
Add support for charging FE based items
2017-12-28 14:53:56 +00:00
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
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
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
冷风
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
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
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
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
53c731d678
Handful of improvements to the electrical furnace, closes #1349
2017-12-04 20:55:57 +00:00
drcrazy
777707373a
Fixed cells piping into Industrial Grinder.
2017-12-04 23:10:33 +03:00
drcrazy
2f54305f6d
Added filter for fluidSlot. Closes #1352
2017-12-04 22:34:34 +03:00
冷风
e8d6009e83
Update zh_cn.lang
2017-12-02 08:26:48 +08:00
drcrazy
df24adb936
Made solar panel wrenchable
2017-12-01 19:24:02 +03:00
drcrazy
6202b46cf7
Fixed unused imports
2017-12-01 19:04:30 +03: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
b2d2be24c6
Updated recipies and fixed build
2017-11-30 16:46:11 +03:00
drcrazy
f6fca1c623
Merge branch '1.12' of https://github.com/TechReborn/TechReborn.git into feature/solar-panles
2017-11-29 17:13:36 +03:00
drcrazy
9ac8b31599
Fixed TOP\Waila icon for active machine
2017-11-29 15:23:40 +03:00
modmuss50
4d043faa27
Fixes #1344
2017-11-29 09:35:00 +00:00
modmuss50
2603fa5df7
Merge remote-tracking branch 'origin/1.12' into 1.12
2017-11-28 17:44:18 +00:00
modmuss50
b8964b6eca
Update mappings
2017-11-28 17:25:36 +00: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
drcrazy
be227b4edb
Fixed type in zenclass name. Closes #1332
2017-11-28 15:37:38 +03:00
modmuss50
3afe2c8910
Add lang names for new lights
2017-11-28 15:37:34 +03:00