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

500 commits

Author SHA1 Message Date
Johannes Gäßler
af8860be2f Merge remote-tracking branch 'origin/unstable' into 
CircuitChemistryUpdateFollowup

Conflicts:
	src/main/java/gregtech/api/enums/Materials.java
	src/main/java/gregtech/common/GT_RecipeAdder.java
	src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
 2017-08-19 14:24:52 +02:00
Johannes Gäßler
1b5047df4f Old chemical recipes are now enabled by default, marked as deprecated 2017-08-19 10:43:07 +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
Muramasa-
14a7d0768f Show dim id with scanner 2017-08-11 23:04:33 +01: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
9962e826a7 Merge pull request #1159 from JohannesGaessler/AshRebalance 
Ash rebalance
 2017-08-11 15:16:16 +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
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
Johannes Gäßler
c2ededaf5a Made the tooltips for Multiblock Hatches more descriptive. 2017-08-07 22:00:26 +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
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
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
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
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
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
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
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
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
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
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
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
5a8da3da90 Added Ash component Materials 2017-07-15 10:11:21 +02:00
Dimach
8659f5fd70 Fixed bug - isAllowedToPutIntoSlot don't check size of inventory. 2017-07-15 01:05:12 +03: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
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
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
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
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
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
2385f04b41 Fix cover and mode spelling 2017-07-01 18:14:05 +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
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