Sangui/GT5-Unofficial
2
1
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions
1539 commits 8 branches 203 tags 97 MiB
Commit graph

1313 commits

Author SHA1 Message Date
Antifluxfield
ae5a1e117d Move the Data-Access codes only to those who really needs them. 2017-08-16 13:35:45 +08:00
Antifluxfield
c09f6b5bdd Fix Tooltip of Pump 
Add the missing bracket
 2017-08-16 13:14:23 +08:00
Johannes Gäßler
75a528d825 Added Ass. recipes for Electronic Circuit components, reduced GT time 
The following components can now be made in an Assembling Machine:
-Coated Circuit Board (-62.5% Sticky Resin cost)
-Vacuum Tube (-33% Copper/Paper cost)
-Phenolic Circuit Board (-20% Glue/Bisphenol A cost)

The time needed to make Glass Tube in the Alloy Smelter has been
reduced: 12s -> 8s
 2017-08-13 11:51:45 +02:00
Johannes Gäßler
a184258c98 Reverted the changes to basic machine processing. 
Basic Machines no longer automatically add an integrated circuit to
their input.
 2017-08-13 09:08:24 +02:00
Technus
8eade43a19 Fix NPE, GREG why u no crash game! 2017-08-12 15:08:25 +02:00
Muramasa-
9fc5d17eb5 Pump tooltips 2017-08-12 02:21:09 +01:00
Muramasa-
14a7d0768f Show dim id with scanner 2017-08-11 23:04:33 +01:00
Muramasa-
8b85da877d implements #1061 2017-08-11 22:52:51 +01:00
Muramasa-
eb24bee24b Some tooltip info #1183 2017-08-11 22:08:49 +01:00
Muramasa-
d58cece573 maybe correct #1137 2017-08-11 21:19:55 +01:00
Blood-Asp
a7c5d30146 Merge pull request #1172 from JohannesGaessler/MoreItemPipeMaterials 
More Item Pipe Materials
 2017-08-11 21:24:48 +02:00
Blood-Asp
d4ea25e1bc Merge pull request #1171 from JohannesGaessler/PyrolyzeOvenCoilScaling 
Pyrolyse oven coil scaling
 2017-08-11 21:20:08 +02:00
Blood-Asp
ff7396509b Merge pull request #1176 from Dimach/unstable-4 
Added new info to batbuffer nuclear control panel and fixed bug
 2017-08-11 21:14:08 +02:00
Blood-Asp
1b1f96dcd9 Merge pull request #1162 from JohannesGaessler/CrackingBalanceFollowup 
Cracking Balance Followup
 2017-08-11 15:18:10 +02:00
Blood-Asp
9962e826a7 Merge pull request #1159 from JohannesGaessler/AshRebalance 
Ash rebalance
 2017-08-11 15:16:16 +02:00
Blood-Asp
42094fdf46 Merge pull request #1158 from JohannesGaessler/StoneDustRebalance 
Stone Dust Rebalance
 2017-08-11 15:07:05 +02:00
Blood-Asp
2c50b0a825 Merge pull request #1157 from Dimach/unstable-1 
Fixed bug - isAllowedToPutIntoSlot don't check size of inventory.
 2017-08-11 14:54:23 +02:00
Blood-Asp
c0da1931dd Merge pull request #1156 from Antifluxfield/distillery-recipe-fix-alt 
Another Distillery recipe fix
 2017-08-11 14:33:27 +02:00
Blood-Asp
4ae02f55c8 Merge pull request #1153 from JohannesGaessler/MultiblockFluidIOFix 
Multiblock Fluid IO fix
 2017-08-11 14:24:37 +02:00
Blood-Asp
987d1ec11e Merge pull request #1149 from joakibj/fix-orebasalticmineralsand 
Fix oreBasalticMineralSand properly being mapped to "ore" prefix
 2017-08-11 14:21:03 +02:00
Blood-Asp
46420e73cb Merge pull request #1144 from Dimach/unstable 
Fixed coloring of pyrolyse oven.
 2017-08-11 14:19:10 +02:00
Johannes Gäßler
a749a8536f Reverted changes to Mercury Ore Washing. 2017-08-07 23:12:27 +02:00
Johannes Gäßler
c2ededaf5a Made the tooltips for Multiblock Hatches more descriptive. 2017-08-07 22:00:26 +02:00
Johannes Gäßler
f3d3cc24de Fixed a bug where the Nugget amount did not scale with the config 2017-08-07 21:20:43 +02:00
Johannes Gäßler
4822c5ca28 Reverted the Galena formula: PbS -> Pb3Ag3S2 2017-08-07 21:06:41 +02:00
Johannes Gäßler
e4fff57b04 Reverted the change that gated Plastic at MV. It's available at LV again 2017-08-07 20:56:22 +02:00
Johannes Gäßler
3b7a016408 Replaced Tin with Wrought Iron as Item Pipe Material 2017-08-07 20:50:41 +02:00
Johannes Gäßler
a7787342b1 Fluid can now also be locked via cells, added a chat message 2017-08-06 12:05:08 +02:00
Johannes Gäßler
a63730107b Implemented NBT for the Locked Fluid 2017-08-06 09:41:44 +02:00
Johannes Gäßler
cbcb04d117 Output Hatches can now be locked to a specific fluid 
Currently not working as intended
 2017-08-06 09:36:05 +02:00
Johannes Gäßler
9bd9d7d5e0 Fixed a bug with ghost Items left behind in the Large Chemical Reactor 2017-08-06 09:36:02 +02:00
Johannes Gäßler
2e849a4ec8 Fixed a bug where a recipe had the wrong amount of Cells 2017-08-06 09:35:59 +02:00
Johannes Gäßler
469e65014e Fixed accidental change to the Cumene recipes due to not pulling 2017-08-06 09:35:56 +02:00
Johannes Gäßler
19817f2a26 Fixed Salt processing recipes 
SaltWater now yields the same amount of material as Salt Dust.
Increased the energy cost of electrolyzing Salt to make netto energy
yield via NaOH+Hydrogen negative.
 2017-08-06 09:35:53 +02:00
Antifluxfield
8a2d88c157 Fix imbalanced recipe 2017-08-06 09:35:50 +02:00
Johannes Gäßler
74529795fb Removed Burn Value for Carbon Dust. 2017-08-06 09:35:47 +02:00
Johannes Gäßler
2ddf1d19ad Added the Large Chemical Reactor Controller inventory to the item input 2017-08-06 09:35:44 +02:00
Johannes Gäßler
818c9a55a8 Fixed a bug where Brick, Clay, and Fireclay had the wrong texture sets. 
The above materials originally had the ROUGH texture. I tested what they
would look like with the DULL texture and I forgot to revert it
afterwards.
 2017-08-06 09:35:40 +02:00
Johannes Gäßler
0ddc793c9d Enabled Coal/Charcoal/Coal Coke Blocks for the Primitive Blast Furnace 2017-08-05 23:22:45 +02:00
Johannes Gäßler
1751ec494c Just in case the number goes negative 2017-08-05 08:43:14 +02:00
Daniel
c9ea7f7727 Update commentary 2017-08-04 23:02:16 +02:00
Technus
fc08b67f7d Fix rare case of texture not updating when: 
Changing texture from page x to page 0 without changing the texture id
 2017-08-04 22:03:59 +02:00
Johannes Gäßler
cd4ca84e80 Fixed a bug with ghost Items left behind in the Large Chemical Reactor 2017-08-04 10:47:54 +02:00
Technus
bf4f19557a Fix one missing spot in deprecated api. 
(for texture change use that is)
 2017-08-03 23:15:52 +02:00
Daniel
c0b1f74e08 Minor error correction 
We have 16 tiers of textures.
 2017-08-03 22:54:36 +02:00
Technus
94ed98cbbd More compatible attempt 2017-08-03 22:52:56 +02:00
Johannes Gäßler
3b976f4aea Multiblock Chemical Reactor now also automatically adds an Int. Circ. 2017-08-02 22:24:53 +02:00
Johannes Gäßler
ee7f576abf Reenabled regular Rubber for the EV Conveyor Belt 2017-08-02 22:15:30 +02:00
Technus
85479e1779 Add pages to array 2017-08-02 19:10:54 +02:00
Technus
281254348e Expand to add proper texture paging support. 2017-08-02 19:08:45 +02:00
Antifluxfield
a1f0a213c4 Find a better way to handle those dusts 2017-08-02 16:04:25 +08:00
Johannes Gäßler
b205b9a9bd Merge branch 'unstable' into AshRebalance 
Conflicts:
	src/main/java/gregtech/api/enums/Materials.java
 2017-08-02 08:47:25 +02:00
Johannes Gäßler
dac3ea04d0 Reduced SMD Capacitor cost 2017-08-01 22:03:32 +02:00
Johannes Gäßler
3fb3254d46 Reduced the cost of Microprocessors 2017-08-01 21:42:24 +02:00
Johannes Gäßler
f0326b8317 Made Niobium more accessible 
Niobium can now be obtained from Apatite and Pyrolusite as Byproducts.
apatite veins now also contain Pyrochlore (new materials, contains
Niobium) instead of Phosphate (PO4).
 2017-08-01 20:51:36 +02:00
Johannes Gäßler
c146a47ff9 Adapted the Large Chemical Reactor recipes for the Int. Circuits 2017-08-01 18:33:28 +02:00
Johannes Gäßler
d563a92dbc Moved Synthetic Rubber requirement: EV -> IV, made it more convenient 
Cable insulation works as it did before for EV cables.
IV+ Cables can be insulated with only molten Silicone.
Insulation now also works with whole Dusts at 4x the batch size.
 2017-08-01 16:08:15 +02:00
Johannes Gäßler
d1a106aa81 Added a line to the NEI handler that hints at leaving IntCirc(0) empty 2017-08-01 13:56:29 +02:00
Johannes Gäßler
4bfbdcdb1d Made it so that if two inputs are equal an Integr. Circuit (0) is added 2017-08-01 11:20:55 +02:00
Johannes Gäßler
ecf7b4aa50 Empty slots are only used as IntCirc(0) if no other IntCirc is in input 2017-08-01 10:35:11 +02:00
Johannes Gäßler
dc31c9ebdb Made it so that empty slots are treated as Integ. Circ. with config 0 2017-08-01 09:01:03 +02:00
Antifluxfield
b7e0863207 Update GT_GUIContainerMetaTile_Machine 2017-08-01 09:42:46 +08:00
Johannes Gäßler
ff35ae8d91 Overhauled Chemical recipes 
Chemical Recipes now have a controllable output pattern.
By adding an Integrated Circuit the Fluid output can automatically be
canned into empty cells.
Water outputs can also be automatically voided.
This reduces the need for fluid Canners in a processing line.
 2017-07-31 23:49:21 +02:00
Johannes Gäßler
3ddd4158ab Changed Vacuum Freezer Circuits: Elite -> Data/Extreme 2017-07-31 10:15:32 +02:00
Johannes Gäßler
83d64e5d52 Added a new Basic Circuit: Microprocessor 
Produced similarly to the Integrated Processor, but yields 2 Basic
Circuits instead of 1 Good Circuit.
 2017-07-31 10:10:36 +02:00
Johannes Gäßler
6a1d32e4a3 Overhauled the Wetware Circuit recipes 
They no longer need beer.
Also the basic Wetware Processor only needs 1 Wetware Circuit Board.
 2017-07-31 09:46:57 +02:00
Johannes Gäßler
dae6c0b51d Reduced Circuit costs 
From Integrated Processors onward:
-The basic Circuit Tier yields 4 Circuits
-The conversion rate has been changed:
    Old: Basic --3--> Assembly --2--> Computer --4--> Mainframe
    New: Basic --2--> Assembly --3--> Computer --4--> Mainframe
 2017-07-31 09:46:54 +02:00
Dimach
2a672556e6 Added new info to batbuffer sensor card (nuclear control panel) - average input and output. 
Also fixed bug in average input/output calculation.
 2017-07-30 04:11:56 +03:00
Dimach
2482504b50 Added new function to GT scanner - print voltage and amperage of electric cable at last second. 2017-07-28 16:12:40 +03:00
Technus
c54ba03b4b Texture overhaul, 
allows for more textures to be added for casing, with extra byte of data for paging.

Just change the value of mTexturePage at the same time you change mMachineBlock.
 2017-07-28 12:56:47 +02:00
Johannes Gäßler
af36dd3099 Fixed a bug where every Fluid was put out at the top of the EBF 2017-07-27 22:44:33 +02:00
Johannes Gäßler
bfea3e8e99 Increased output chance for Silver from washing with Mercury to 99% 2017-07-26 23:54:00 +02:00
Johannes Gäßler
1763f60b36 Added a config for the converion rate of Direct Smelting: 1 <-> 2/3 2017-07-26 23:26:17 +02:00
Johannes Gäßler
54fc4e222a Overhauled Fiberglass Circuit Board 
Renamed: Fiberglass Circuit Board -> Fiber-Reinforced Circuit Board
Fiber-Reinforced Boards are now made by combining Epoxy Resin with
either Glass Fiber or Carbon Fiber.

Glass Fiber is produced from Borosilicate Glass, which is in turn
produced from Glass and Boron.
To make this feasible Salt and Rock Salt now yield Borax as a byproduct.
 2017-07-26 21:50:09 +02:00
Johannes Gäßler
cc63900ee8 Reduced cost of Small Coil to 50%, added Ferrite for 25% cost 2017-07-25 23:13:07 +02:00
Johannes Gäßler
4cda183354 Added a new Circuit board tier: Plastic Circuit Board 2017-07-25 17:42:52 +02:00
Johannes Gäßler
ff146a32bd Moved material IDs for the new materials due to Ash Rebalance materials 2017-07-25 09:37:35 +02:00
Johannes Gäßler
60fcf643c9 Fixed a bug where a recipe had the wrong amount of Cells 2017-07-24 23:57:34 +02:00
Johannes Gäßler
f684991ba1 Added Item Pipes made from Tin, Nickel, Cobalt, Aluminium 2017-07-24 22:57:31 +02:00
Johannes Gäßler
ea769424c4 Adjusted GT_Pollution Javadoc 2017-07-24 22:26:51 +02:00
Johannes Gäßler
d3eb6181f7 Pyrolyze Oven processing speed now depends on Coil Tier 2017-07-24 22:21:32 +02:00
Johannes Gäßler
0215335867 Increased Direct Smelting yield: 5 Nuggets -> 6 Nuggets 
Previously you would only get 1 extra Nugget from Macerating Ore.
Now you get 3 extra Nuggets.
 2017-07-24 19:12:42 +02:00
Johannes Gäßler
5371a8b2ad Pyrolyze Oven now accepts all Coils, transformed umlauts in doc to asci 2017-07-24 18:58:40 +02:00
Johannes Gäßler
a0c6ec45da Implemented Carbothermic Reduction for Silicon Dioxide 2017-07-24 12:16:56 +02:00
Johannes Gäßler
480f2f1413 Updated DONT_ADD_DEFAULT_BBF_RECIPE String 2017-07-24 12:07:44 +02:00
Johannes Gäßler
306160fb69 Implemented Fluid Output for the EBF 
Regular Fluids are put out at the bottom layer.
CO2, CO, and SO2 are put out at the top layer and their amount scales
with the tier of the EBF's Muffler Hatch
 2017-07-24 11:14:52 +02:00
Johannes Gäßler
a687bcd24e Changed Galena Formula: Pb3Ag3S2 -> PbS, added PbS -> Pb direct smelting 
Also added the corresponding pyrometallurgical recipes.
 2017-07-23 23:22:06 +02:00
Johannes Gäßler
f816fbbd97 Removed redundant Magnetite Blast recipe 2017-07-23 21:55:53 +02:00
Johannes Gäßler
f737642762 Fixed accidental change to the Cumene recipes due to not pulling 2017-07-23 21:33:18 +02:00
Johannes Gäßler
f95d89a5e6 Implemented Roasting and Carbothermic Reduction for the EBF. 2017-07-23 21:30:57 +02:00
Johannes Gäßler
29efe8ea5d Fixed Salt processing recipes 
SaltWater now yields the same amount of material as Salt Dust.
Increased the energy cost of electrolyzing Salt to make netto energy
yield via NaOH+Hydrogen negative.
 2017-07-23 16:50:04 +02:00
Johannes Gäßler
8fa91db261 Added BBF Recipes for increased output from Direct Smelting 2017-07-23 15:01:09 +02:00
Johannes Gäßler
beaa54eb41 Reworked Direct Smelting, added Magnetite -> Iron smelting 
All Direct Smelting recipes now yield 1 ingot per Ore Block or 5 Nuggets
per Crushed Ore/Dust
 2017-07-22 23:21:28 +02:00
Johannes Gäßler
4995bc3a4e Reduced direct smelting from impure/purified dust 2017-07-22 18:46:11 +02:00
Antifluxfield
d154d0ff08 Fix imbalanced recipe 2017-07-22 19:25:13 +08:00
Antifluxfield
848a57291a Correct description 
The cost is actually tripled at:
https://github.com/Blood-Asp/GT5-Unofficial/blob/unstable/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_Regulator.java#L95
 2017-07-22 16:02:44 +08:00
Johannes Gäßler
a786856ce6 Removed Burn Value for Carbon Dust. 2017-07-20 09:22:18 +02:00
Johannes Gäßler
fff1f594fb Added the Large Chemical Reactor Controller inventory to the item input 2017-07-17 20:08:47 +02:00
SLiMylya
820b335d83 add config EnableZPMandUVBatteries default false 2017-07-17 12:56:37 +03:00
Antifluxfield
64957ccd0f Update GT_MetaTileEntity_OilDrillBase 2017-07-17 16:29:47 +08:00
Antifluxfield
3c397d6169 Update description 2017-07-17 16:09:35 +08:00
Antifluxfield
4d90afad87 Just let the progress time decided by the area. That's enough. 2017-07-17 15:27:12 +08:00
Antifluxfield
d1671eaf33 Rebalance III. This time it should be fine... 2017-07-17 15:16:16 +08:00
Antifluxfield
d532cb67f7 Rebalance process time II 2017-07-17 15:01:32 +08:00
Antifluxfield
416890142c Rebalance process time 2017-07-17 14:53:45 +08:00
Antifluxfield
c0d9d5a268 Backfiller 3 => 2 2017-07-17 14:29:21 +08:00
Johannes Gäßler
dac010bbc9 Adjusted cracked fluid distillation speed, LightFuel/Naphtha balance 2017-07-16 23:20:48 +02:00
Johannes Gäßler
9db52423cc Fixed a bug where Brick, Clay, and Fireclay had the wrong texture sets. 
The above materials originally had the ROUGH texture. I tested what they
would look like with the DULL texture and I forgot to revert it
afterwards.
 2017-07-16 14:00:00 +02:00
Johannes Gäßler
184774c7f1 Added config options for old ash recipes, tweaking ash output 2017-07-16 12:14:49 +02:00
Antifluxfield
55af1972b8 Update GT_MetaTileEntity_DrillerBase.java 2017-07-16 15:15:23 +08:00
Johannes Gäßler
85a921eb84 Added recipes for CaO, MgO, reenabled falsely disabled Steel Ash output 2017-07-16 08:57:25 +02:00
Antifluxfield
fbdb6ceecf Adding description 2017-07-16 13:11:42 +08:00
Antifluxfield
f5195f822d Add Concrete Backfiller 2017-07-16 13:11:17 +08:00
Johannes Gäßler
ffac667541 Changed the Ash centrifugation recipe to the new materials. 2017-07-15 11:44:01 +02:00
Johannes Gäßler
5a8da3da90 Added Ash component Materials 2017-07-15 10:11:21 +02:00
Johannes Gäßler
f7e33fd402 Capped the output multiplier of stone dust to 100%. 2017-07-15 00:49:50 +02:00
Dimach
8659f5fd70 Fixed bug - isAllowedToPutIntoSlot don't check size of inventory. 2017-07-15 01:05:12 +03:00
Johannes Gäßler
3253175e5f Rebalanced Stone Dust centrifugation 2017-07-14 23:13:45 +02:00
Antifluxfield
1fff7f2aa4 Update GT_RecipeAdder.java 2017-07-14 00:12:44 +08:00
Antifluxfield
50229e4506 Add Oil Drill II & III 2017-07-14 00:10:39 +08:00
Antifluxfield
0f2db4f76a Oil Drill configurable 2017-07-13 22:46:51 +08:00
Antifluxfield
d682ca0d36 Oil Drilling Rig now using DrillerBase 2017-07-13 14:28:05 +08:00
Antifluxfield
fb508132d9 Ore Drilling Plant now using DrillerBase 2017-07-13 14:27:18 +08:00
Antifluxfield
fb163d1be0 Extract the drilling code from OreDrillingBase to DrillerBase 2017-07-13 14:26:37 +08:00
Antifluxfield
11213d18d7 Make Data Access Hatch an universal hatch 2017-07-13 14:25:43 +08:00
Antifluxfield
000740ff66 Reduce the batch size if fluid amount is exceeding 2017-07-13 01:57:38 +08:00
Johannes Gäßler
96d56e97da Added an option to findRecipe() to only return recipes with enough input 2017-07-11 17:14:00 +02:00
Johannes Gäßler
bb68a5f74b Made it so that multiblocks will look for empty output hatches. 
Previously when there was more than one fluid output multiblocks would
only try to put it into one of the output hatches.
 2017-07-10 22:39:51 +02:00
Johannes Gäßler
da2e748e8a Fixed Item Distributor causing an OutOfboundsException for invalid NBT. 2017-07-09 23:14:30 +02:00
SLiMylya
612cece629 update change 2017-07-09 19:36:23 +03:00
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
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
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
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