Commit graph

1046 commits

Author SHA1 Message Date
Blood-Asp
18c92489fd Update Modpack info 2017-06-02 12:17:56 +02:00
Blood-Asp
8342537d8c Add newlines 2017-06-01 21:23:34 +02:00
Blood-Asp
dad36f6c48 Added links to Addons and modpacks to readme 2017-06-01 21:21:27 +02:00
Techlone
4f6bdedf96 Merge branch 'unstable' of https://github.com/Techlone/GT5-Unofficial into unstable 2017-06-01 23:09:27 +05:00
Techlone
f2f74c09f9 Merge branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficial into unstable 2017-06-01 20:59:20 +05:00
Blood-Asp
7ddf9c5f4e Teleporter and Energy Transmitter fixes 2017-06-01 13:28:05 +02:00
Daniel
0a928887ed Cleanup and some commentary 2017-06-01 13:24:02 +02:00
Daniel
8b1e6d55be 7bd71fe 2017-06-01 13:23:51 +02:00
Daniel
28694dac93 Fix that so pollution is not negative. 2017-06-01 13:22:27 +02:00
Technus
a4f0426159 8e0e516 2017-06-01 13:22:10 +02:00
Technus
a99e0d4ffb Not needed. 2017-06-01 13:19:27 +02:00
Technus
82458fed2e Cherry-Pick c12e474
c12e474c23
2017-06-01 13:18:34 +02:00
Technus
7a08da6a06 that makes it look better? 2017-06-01 12:01:20 +02:00
Technus
427b1e105a Why does one change the machine state TWICE in the same tick... 2017-06-01 12:00:52 +02:00
Blood-Asp
9a69e1978d Fix comb processing recipes #1052 2017-05-31 22:57:21 +02:00
Blood-Asp
94f8581477 Fix multiblock recipe search fix #1044 2017-05-31 21:52:58 +02:00
Blood-Asp
b047ab56b2 Fix spelling #1043 2017-05-31 21:42:32 +02:00
Blood-Asp
080c229e09 fix #1041 2017-05-31 21:37:50 +02:00
Blood-Asp
4c17c2beff Make Internal wireless redstone work as machine controller 2017-05-31 21:37:26 +02:00
Blood-Asp
09e0361990 Add recipe for very heavy oil 2017-05-31 21:11:34 +02:00
Techlone
f19e920925 Merge branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficial into unstable 2017-06-01 00:01:54 +05:00
Blood-Asp
b418fede09 Change Automaintain default 2017-05-31 18:59:32 +02:00
Blood-Asp
5386a69022 Merge pull request #1051 from JohannesGaessler/unstable
[5.09.29] EBF recipe fix followup
2017-05-31 18:58:06 +02:00
Blood-Asp
3f73fa9b86 Merge pull request #1058 from Georggi/patch-4
Auto Maintenance Hatch tweaks
2017-05-31 18:57:39 +02:00
Blood-Asp
ba030d3239 Merge pull request #1060 from JohannesGaessler/MaterialFormulaFix
Material formula fix
2017-05-31 18:57:05 +02:00
Blood-Asp
b170cd5a5c Merge pull request #1067 from antifluxfield/unstable
Wrong behavior of Player Detector
2017-05-31 18:55:35 +02:00
Blood-Asp
1af33411d2 Disable switching armor gui because of broken sync 2017-05-31 18:53:56 +02:00
Blood-Asp
c28a8ceb78 Catch broken items on recipe move 2017-05-31 18:10:11 +02:00
Blood-Asp
40304ed2f5 Catch login armor crash 2017-05-31 18:09:30 +02:00
Techlone
a391c6fca8 Merge branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficial into unstable 2017-05-27 20:45:19 +05:00
antifluxfield
c42c2facb1 Update GT_Cover_PlayerDetector.java 2017-05-27 14:48:39 +08:00
antifluxfield
aa4839ebf6 Update GT_Cover_PlayerDetector.java 2017-05-27 14:46:03 +08:00
Johannes Gäßler
32db407391 Removed debugging prints accidentally left in the previous commit 2017-05-18 19:27:53 +02:00
Johannes Gäßler
d805ce4613 Fixed MaterialStack String representations sometimes missing brackets 2017-05-18 19:22:06 +02:00
Yuriy Shnitkovskiy
c0f8bafc60 I guess I wanted to put it here for some reason 2017-05-16 19:52:04 +03:00
Yuriy Shnitkovskiy
bc7eaaa762 Added config for automation 2017-05-16 19:49:46 +03:00
Yura
4e3ed071dc Auto Maintenance Hatch tweaks
Fixed #958 and #1053, allowed robots\pipes to interact with it.
2017-05-16 16:17:01 +03:00
Johannes Gäßler
3b681b69d5 Changed multiblocks so they all consider all inputs for finding recipes 2017-05-10 19:56:36 +02:00
Techlone
21f2b50507 Merge branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficial into unstable 2017-05-10 21:39:33 +05:00
Blood-Asp
6398c06506 Merge pull request #1048 from JohannesGaessler/unstable
[5.09.29] EBF recipe fix
2017-05-10 17:16:00 +02:00
Johannes Gäßler
b1e35de06e Reverted erroneous previous commit. 2017-05-07 08:47:24 +02:00
Johannes Gäßler
dc217f66a8 Created a first draft for the Large Chemical Reactor 2017-05-06 21:23:32 +02:00
Johannes Gäßler
0aeab34a56 Fixed the Electric Blast Furnace not recognizing recipes when there is
more than one Fluid input.

Also added a String representation for GT_FluidStack that was used for
debugging.
2017-05-06 18:01:06 +02:00
Blood-Asp
e7d8d5ecbe Merge pull request #1025 from JohannesGaessler/SteamProductionImprovement
Steam production improvement / Tooltip improvement / Pollution adjustment
2017-04-27 18:26:42 +02:00
Blood-Asp
77e1b53724 Merge pull request #1038 from Techlone/fix_assline_eu_production
Fix eu consumption absence by AssemblyLine and some clean up
2017-04-27 18:22:48 +02:00
Techlone
1d70b454c7 Merge branch 'fix_assline_eu_production' into unstable 2017-04-27 20:18:58 +05:00
Techlone
19a5320f00 Merge remote-tracking branch 'remotes/JohannesGaessler/SteamProductionImprovement' into unstable 2017-04-27 20:18:38 +05:00
Techlone
f55959dd92 Merge branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficial into unstable 2017-04-27 20:18:13 +05:00
Techlone
cae69aa28f Fix eu consumption absence by AssemblyLine and some clean up 2017-04-27 19:35:07 +05:00
Blood-Asp
07aa57e7de Merge pull request #1032 from Techlone/fix_micro_recipies_1029
Fix micro recipies
2017-04-27 16:27:09 +02:00