Commit graph

1515 commits

Author SHA1 Message Date
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