Commit graph

1595 commits

Author SHA1 Message Date
Blood-Asp
7bfa2b3e6e Merge branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficial into unstable 2017-07-09 16:24:09 +02:00
Blood-Asp
6ff1299467 oil fix part 2 2017-07-09 16:23:45 +02:00
Joakim Bjørnstad
885c8b00e9 Fix oreBasalticMineralSand properly being mapped to "ore" prefix, instead of the "oreBasalt" prefix, yielding the wrong material "icMineralsand" 2017-07-09 11:55:04 +02:00
JohannesGaessler
b85de990ee Merge pull request #1148 from Antifluxfield/patch-1
Fixed formulas for SO2, SO3
2017-07-09 08:01:36 +02:00
Antifluxfield
26e8f2337f Fix another 2 formulas
S2O => SO2;
S3O => SO3.
2017-07-09 13:08:39 +08:00
SLiMylya
147101ff6c add achievements 2017-07-08 14:12:20 +03:00
SLiMylya
e2017c72c3 add recipe 2017-07-08 14:10:59 +03:00
SLiMylya
733d774817 add icon battery 2017-07-08 14:07:31 +03:00
SLiMylya
c607243491 add battery 2017-07-08 14:04:12 +03:00
JohannesGaessler
1b8fdd952e Merge pull request #1145 from Antifluxfield/patch-1
Fix Item Distributor recipes
2017-07-08 08:36:13 +02:00
Antifluxfield
f8b62ed8d6 Fix Item Distributor recipes 2017-07-08 05:08:54 +08:00
Dimach
1b50758a2e Fixed coloring of pyrolyse oven. 2017-07-07 12:36:47 +03:00
Blood-Asp
f657b3d0c6 Fix Pyrooven textures 2017-07-06 23:16:26 +02:00
Blood-Asp
3f8b428110 Restore old oil calculation 2017-07-06 23:02:29 +02:00
Johannes Gäßler
6e0a7e083b Removed the svg source files for textures added by JohannesGaessler 2017-07-06 22:48:48 +02:00
Blood-Asp
8cfd1ff724 Merge pull request #1132 from JohannesGaessler/ItemDistributor
Item Distributor
2017-07-06 22:36:37 +02:00
Blood-Asp
2ec4a8a8c4 Merge pull request #1135 from JohannesGaessler/InventoryIndexFix
Fixed inventory misalignment when updating 5.09.30 -> 5.09.31
2017-07-06 22:36:14 +02:00
Blood-Asp
2673a6fb86 Merge pull request #1142 from Dimach/miners
Added LV and MV miners.
2017-07-06 22:35:57 +02:00
Dimach
480132b25f Changed miner rates. 2017-07-06 17:56:43 +03:00
Dimach
0375e11deb Changed MV miner radius. 2017-07-06 14:35:33 +03:00
Dimach
0334a19993 Changed miner mechanics and rates. 2017-07-06 13:42:45 +03:00
Dimach
98e214b873 Fixed NBT bug in OreDrillingPlant. 2017-07-06 11:14:40 +03:00
Dimach
835dd2dacc Changed naming of constants. 2017-07-06 11:13:32 +03:00
JohannesGaessler
d2b188025d Merge pull request #1126 from Antifluxfield/PE-polymerization-fix
Trying to fix PE polymerizing recipe
2017-07-06 08:32:16 +02:00
Dimach
424b356fee Added LV and MV miners. 2017-07-06 06:48:18 +03:00
Alkalus
110545a24d Merge pull request #1139 from Antifluxfield/patch-1
Fix the names of the Adv. Data Access Hatch.
2017-07-04 20:48:33 +10:00
Antifluxfield
36d481a2a0 Fix the names of Data Access Hatches 2017-07-03 17:40:50 +08:00
Antifluxfield
369722f0c9 Update GT_MachineRecipeLoader.java 2017-07-03 04:31:00 +08:00
Antifluxfield
006bab8dfa Update GT_RecipeAdder.java 2017-07-03 04:29:24 +08:00
Antifluxfield
8f44019518 Update IGT_RecipeAdder.java 2017-07-03 04:27:06 +08:00
Johannes Gäßler
7d074d985f Accounted for misc slots when shifting machine inventory contents 2017-07-02 17:12:30 +02:00
Johannes Gäßler
34058f0e1e Fixed Diluted Sulfuric Acid recipes, PTFE Pipe Casing name 2017-07-02 12:25:33 +02:00
Johannes Gäßler
5d8bcb0af3 Added a method for calculating total version ID 2017-07-02 01:02:55 +02:00
Johannes Gäßler
a6046ddfad Fixed inventory misalignment when updating 5.09.30 -> 5.09.31
I added a new method to BaseMetaTileEntity that shifts the Inventory
index according to the change in Input/Output slots.

Instrumentally I have added a new version ID that considers the GT
subversion.
2017-07-02 00:09:48 +02:00
Blood-Asp
6287e1e67f small pollution rebalancings 2017-07-01 19:01:27 +02:00
Blood-Asp
caa4b8a1a7 fix cheese as dough #1123 2017-07-01 18:45:26 +02:00
Blood-Asp
a0031717d1 Make assembly line use cheaper circuit techs. #1114 2017-07-01 18:42:02 +02:00
Blood-Asp
7642e16c3c more spelling 2017-07-01 18:38:41 +02:00
Blood-Asp
2385f04b41 Fix cover and mode spelling 2017-07-01 18:14:05 +02:00
Blood-Asp
026fcfcbba Clean reset of Datastick so remaining old data does not break assemblyline. 2017-07-01 17:50:27 +02:00
Blood-Asp
4fbd38eb0b Merge pull request #1129 from Antifluxfield/PlayerDetector-fix
Player detector fix
2017-07-01 17:35:30 +02:00
Blood-Asp
ebd2d13d7a Merge pull request #1130 from Antifluxfield/AssemblyLine_upgrade
Assembly line upgrade
2017-07-01 17:11:35 +02:00
Blood-Asp
37869e5c6c Merge pull request #1128 from Dimach/oil-fix
Removed divider that already applied in Gt_UndergroundOil.
2017-07-01 17:08:51 +02:00
Blood-Asp
618a656591 Merge pull request #1122 from Antifluxfield/patch-1
Fixed 2 formulas
2017-07-01 17:08:03 +02:00
Johannes Gäßler
baa04cc51b Added GUI classes for the Item Distributor, fixed EU IO logic 2017-07-01 13:01:11 +02:00
Johannes Gäßler
b9f8927b3d Made Automation tooltips more descriptive
Adjusted allowPutStack, isInputFacing, isOutputFacing for the Item
Distributor
Adjusted onScrewdriverRightClick for the Item Regulator
2017-07-01 11:29:27 +02:00
Johannes Gäßler
e1aafccce5 Added ItemDistributor crafting recipes, reordered ItemDistributor fields 2017-07-01 00:12:34 +02:00
Johannes Gäßler
72a7a2a4c3 Added a new texture for the Item Distributor 2017-06-30 23:18:44 +02:00
Antifluxfield
9fc84fc1e7 Update GT_MachineRecipeLoader.java 2017-06-30 11:32:27 +08:00
Antifluxfield
ff0017de19 Update GT_RecipeAdder.java 2017-06-30 11:32:19 +08:00