Commit graph

928 commits

Author SHA1 Message Date
Johannes Gäßler
9295a4202a Changed the ID of the LCM again because of GTNH collision: 1200 -> 1169 2017-06-06 18:23:11 +02:00
Blood-Asp
589a77c5cb Check general redstoneoutput for null 2017-06-06 16:19:45 +02:00
Blood-Asp
530a334bb1 Fix Nitric Acid name #1079 2017-06-06 15:32:06 +02:00
Blood-Asp
d9a318678c Correcting Steel Boiler Tooltip #1080 2017-06-06 13:00:11 +02:00
Blood-Asp
b4b8820373 Fix vents as covers. Ventcovers now speed up machines 1-3% #1065 2017-06-06 00:07:09 +02:00
Blood-Asp
d26d9e1045 Attempt to prevent worldgen loops with other mods #1063 #828 2017-06-05 23:30:53 +02:00
Blood-Asp
4c25e83b0d Improved large boiler tooltip #877 2017-06-05 21:07:23 +02:00
Blood-Asp
c1f85264a0 Add missing translation lines. #772 2017-06-05 20:45:15 +02:00
Technus
e4b28e6208 Thiccness changes done 2017-06-05 15:36:02 +02:00
Technus
b3d49a8c96 Adjust pipe thiccnes 2017-06-05 15:30:43 +02:00
Technus
8293ac9d5c this actually changes the raytracer boxes reusing the collision boxes 2017-06-05 15:23:37 +02:00
Technus
71aeac25b9 Missing in item pipe 2017-06-05 15:03:34 +02:00
Techlone
7cb51ae461 fix OsmiridiumCasing recipe in Assembler
fix ODP changing state when the tip meets itself
fix cleaning of oreBlockPositions when a mining column was broken
2017-06-05 17:14:24 +05:00
Johannes Gäßler
3ec9ddf346 Changed the MetaGeneratedItem ID of the Large Chem Reactor: 1177 -> 1200 2017-06-04 21:59:12 +02:00
Johannes Gäßler
e42ddd911a Merge branch 'ChemistryUpdate' of https://github.com/JohannesGaessler/GT5-Unofficial into ChemistryUpdate 2017-06-04 20:31:28 +02:00
Johannes Gäßler
d0247a5d73 Moved the casing IDs for the Large Chemical Reactor: 14, 15 -> 4, 5
Limited the minimal recipe time for the LCM to 2 ticks to avoid bugs.
2017-06-04 20:19:07 +02:00
Blood-Asp
e102488f2c More redstone changes 2017-06-04 19:11:03 +02:00
Techlone
5df32b69ab Merge branch 'unstable' into advminer2_improvements 2017-06-04 21:31:08 +05:00
Technus
c9908ffa98 wire/pipe hiding/reduced size 2017-06-04 09:28:43 +02:00
Technus
0db3a1d6df Missing override 2017-06-04 09:25:46 +02:00
vlad20012
64a69695e5 Fixed stored energy integer overflow 2017-06-04 05:32:47 +03:00
Blood-Asp
30de32fb07 Monocrystalline Silicon Boule 2017-06-04 00:28:53 +02:00
Blood-Asp
23de1f09ed Cleanroom controller outputs efficency as redstone signal #948 2017-06-04 00:26:31 +02:00
Technus
467e6ba022 1ddc91a 2017-06-03 16:11:59 +02:00
Blood-Asp
9a3fa2e42c Fix Pollution bug 2017-06-03 13:42:41 +02:00
Techlone
c5402ee389 Some ODP fixes, energy checking, add radius in tooltip, add "missing pipes" message for II-IV tiers
change build.gradle for debugging in IDEA
2017-06-02 22:18:29 +05:00
Blood-Asp
b0049786b7 Make Casings and reinforced blocks transfer redstone signals 2017-06-02 18:15:29 +02:00
Blood-Asp
e3b3fd66f1 Fix compressed meteoric iron recipe. #1071 2017-06-02 12:36:31 +02:00
Techlone
067f4491a8 Merge branch 'unstable' into advminer2_improvements 2017-06-01 20:59:40 +05:00
Techlone
7c48590a49 OreDrill state saving 2017-06-01 20:58:24 +05:00
Techlone
75a33be210 Fix OreDrill; fix getting block in ItemList; some changes in addInformation - need check this 2017-06-01 20:23:13 +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
JohannesGaessler
7eb176f3a2 Merge branch 'unstable' into ChemistryUpdate 2017-06-01 10:22:10 +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
19f7074897 Merge branch 'unstable' into advminer2_improvements 2017-06-01 00:02:13 +05:00
Techlone
b187410005 AdvMiner rewriting; now it's Ore Drilling Plant
Four tiers of Ore Drilling Plant
I - radius is 3 chunks MV+ (default)
II - radius is 4 chunks HV+
III - radius is 6 chunks EV+
IV - radius is 9 chunks IV+

New behavior:
- pick pipes after mining finish
- extract ore block before moving down
2017-06-01 00:01:32 +05:00
Johannes Gäßler
3c45c2accb Added recipes for oil desulfurization with Fluids and Cells swapped. 2017-05-31 19:03:51 +02: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
Johannes Gäßler
038e51535b Fixed a bug where the Chemical Reactor still only had one output slot in
it's machine inventory, causing the second output to be voided.
2017-05-30 17:00:31 +02:00
Johannes Gäßler
38bfbabd58 Fixed a bug where the LCM could have a mMaxProgressTime of zero. 2017-05-30 10:21:46 +02: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
e304e8f9de Fixed stocheometrically incorrect Chloroform recipe. 2017-05-25 01:06:48 +02: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
724f9a4e09 Moved the Biomass -> Ethanol recipes to the simplified chemical recipes. 2017-05-16 00:18:03 +02:00
Johannes Gäßler
8823dc53f8 Added a GUI for the Large Chemical Reactor 2017-05-15 21:08:27 +02:00
Johannes Gäßler
921cff51d8 Bugfix: I had accidentally copied the IC2 Biogas recipes instead of
moving them.
2017-05-14 18:51:58 +02:00
Johannes Gäßler
d77592f68d Moved old IC2 Biogas recipes to the simplified recipes. 2017-05-14 18:49:08 +02:00
Johannes Gäßler
25ff27a2a2 Merge branch 'LargeChemicalReactor' into ChemistryUpdate 2017-05-13 23:40:08 +02:00
Johannes Gäßler
c0152219c5 Corrected several chlorination recipes in terms of stoichiometrics 2017-05-13 23:35:25 +02:00
Johannes Gäßler
a16ea6bbc7 Changed the Layout of the LCM to 3x3x3, tweaked the name of casings and
the descriptions of multiblocks to make them consistent.
2017-05-13 23:08:50 +02:00
Johannes Gäßler
17edbc2d48 Fixed a bug that caused there to be two identical recipes for TiF4 2017-05-13 17:51:51 +02:00
Johannes Gäßler
60348c09ba Added a new recipe map for the LCR, expanded the API to allow for custom
NEI stack positioning.

Refactored the name of the Large Boiler Fake Fuels so they're in line
with other names.
Fixed a bug where the LCM was checking for the wrong casing type.
2017-05-13 16:37:39 +02:00
Johannes Gäßler
3cf169b5c3 Added crafting recipes for the LCH 2017-05-12 22:50:29 +02:00
Johannes Gäßler
20142f1b10 Merge branch 'ChemistryUpdate' into LargeChemicalReactor
Conflicts:
	src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
2017-05-12 21:12:01 +02:00
Johannes Gäßler
3b681b69d5 Changed multiblocks so they all consider all inputs for finding recipes 2017-05-10 19:56:36 +02:00
Johannes Gäßler
0c2dee56da Added new textures for the LCM, using them now 2017-05-09 21:51:49 +02:00
Johannes Gäßler
ad40b85de1 Implemented checkRecipe 2017-05-09 18:25:24 +02:00
Johannes Gäßler
60cea028a4 Reverted an erroneous name change for nitration mixture 2017-05-08 20:37:20 +02:00
Johannes Gäßler
989f2f2356 Deleted prints used for debugging 2017-05-08 00:12:23 +02:00
Johannes Gäßler
7bc06a3969 Implemented checkMachine for the LCR, added machine casings 2017-05-08 00:11:36 +02:00
Johannes Gäßler
4546f45e3a Created a non-functional first draft for the Large chemical Reactor 2017-05-07 15:36:01 +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
Johannes Gäßler
0364c3e708 Small tweak to Rocket Fuel to ensure that production cost > burn value 2017-05-04 22:56:43 +02:00
Johannes Gäßler
5e43252e8a Added a graphic for acids, made the javadoc more descriptive 2017-05-04 22:04:04 +02:00
Johannes Gäßler
26dd5c2af3 Added an svg for misc chemical recipes, tweaked several recipes 2017-05-03 23:38:22 +02:00
Johannes Gäßler
b5e894beeb Added distillation recipe for Phenol, tweaked the graphic for plastics 2017-05-03 00:04:35 +02:00
Johannes Gäßler
f625a93e46 Materials for existing fluids, ash nerf, plastic production svg 2017-05-02 21:06:35 +02:00
Johannes Gäßler
978c4877b6 Added molecular formulas for the new materials, added alternative
charcoal recipes.

Charcoal can now be made by treating Wood Pulp or Sugar with Sulfuric
Acid (takes very long, doesn't scale well)
2017-05-01 22:02:36 +02:00
Johannes Gäßler
a0bf545451 Added config for simple chemical recipes and stone dust centifugation 2017-05-01 14:36:50 +02:00
Johannes Gäßler
2a8bc79bb5 Added recipes for centrifuging Stone Dust
The amount of elements you get from centrifuging is proportional to
their mass percentage in the earths continental crust with a tolerance
of ~5-20%
2017-05-01 12:42:21 +02:00
Johannes Gäßler
09c76543b2 methods for pipe creation, new plastic pipes, implemented PVC
Added a new plastic: Polyvinyl Chloride, currently only used for item
pipes

Added Polytetrafluoroethylene Fluid Pipes

Fixed the number of fluid cells for polymerization, Fixed the default
alpha value for the MaterialBuilder class
2017-05-01 00:47:19 +02:00
Johannes Gäßler
ac49979979 Changed the newly added recipes so that they use the new API 2017-04-30 18:41:42 +02:00
Johannes Gäßler
1f83a98876 New recipes, convenience methods, recipe rebalancings
Implemented new recipes for Gunpowder, Saltpeter, Sulfuric Acid 
Gave Sulfur dust a burn value (1600, the same as coal)
Made all chemical recipes stoichiometrically correct whenever possible
(2 H + 1 O -> 1 H2O instead of 2 H + 1 O -> 3 H2O)
Added a convenience method to Materials that lets you get dust
succinctly
Put all simplified recipe additions in a separate method, the config is
still missing
2017-04-30 18:04:25 +02:00