Commit graph

2806 commits

Author SHA1 Message Date
modmuss50
a3d2aa9907 Merge remote-tracking branch 'origin/1.12' into 1.12 2018-01-31 13:08:35 +00:00
modmuss50
e9039e6693 Fixes AutoCrafting table crash closes #1423 2018-01-31 13:08:21 +00:00
drcrazy
73aa9f1d5e Nerfed oil cell energy output. Closes #1424 2018-01-31 15:39:00 +03:00
modmuss50
34816e5ee7 Fixes #1425 2018-01-31 10:09:39 +00:00
modmuss50
af57ef708d Fixes #1426 2018-01-31 09:46:26 +00:00
modmuss50
6c9712956c Add back config options for copact modules 2018-01-30 23:46:34 +00:00
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