aboutsummaryrefslogtreecommitdiff
path: root/src/main
AgeCommit message (Expand)Author
2017-06-031ddc91aTechnus
2017-06-03Fix Pollution bugBlood-Asp
2017-06-03Made rubber consistent, rewrote WireProcessing, implemented ht cablesJohannes Gäßler
2017-06-03Added two changes accidentally not added to the previous commit.Johannes Gäßler
2017-06-03Increased the input slots of the assembler from 2 to 6.Johannes Gäßler
2017-06-02Some ODP fixes, energy checking, add radius in tooltip, add "missing pipes" m...Techlone
2017-06-02Make Casings and reinforced blocks transfer redstone signalsBlood-Asp
2017-06-02Made it so that low-tech cables can be made with higher-tech insulationJohannes Gäßler
2017-06-02Fix compressed meteoric iron recipe. #1071Blood-Asp
2017-06-01Added methods for adding Distillery recipes with a solid output.Johannes Gäßler
2017-06-01Merge branch 'unstable' into advminer2_improvementsTechlone
2017-06-01OreDrill state savingTechlone
2017-06-01Fix OreDrill; fix getting block in ItemList; some changes in addInformation -...Techlone
2017-06-01Teleporter and Energy Transmitter fixesBlood-Asp
2017-06-01Cleanup and some commentaryDaniel
2017-06-017bd71feDaniel
2017-06-01Fix that so pollution is not negative.Daniel
2017-06-018e0e516Technus
2017-06-01Not needed.Technus
2017-06-01Cherry-Pick c12e474Technus
2017-06-01that makes it look better?Technus
2017-06-01Why does one change the machine state TWICE in the same tick...Technus
2017-06-01Merge branch 'unstable' into ChemistryUpdateJohannesGaessler
2017-05-31Fix comb processing recipes #1052Blood-Asp
2017-05-31Fix multiblock recipe search fix #1044Blood-Asp
2017-05-31Fix spelling #1043Blood-Asp
2017-05-31fix #1041Blood-Asp
2017-05-31Make Internal wireless redstone work as machine controllerBlood-Asp
2017-05-31Add recipe for very heavy oilBlood-Asp
2017-06-01Merge branch 'unstable' into advminer2_improvementsTechlone
2017-06-01AdvMiner rewriting; now it's Ore Drilling PlantTechlone
2017-05-31Added recipes for oil desulfurization with Fluids and Cells swapped.Johannes Gäßler
2017-05-31Change Automaintain defaultBlood-Asp
2017-05-31Merge pull request #1051 from JohannesGaessler/unstableBlood-Asp
2017-05-31Merge pull request #1058 from Georggi/patch-4Blood-Asp
2017-05-31Merge pull request #1060 from JohannesGaessler/MaterialFormulaFixBlood-Asp
2017-05-31Merge pull request #1067 from antifluxfield/unstableBlood-Asp
2017-05-31Disable switching armor gui because of broken syncBlood-Asp
2017-05-31Catch broken items on recipe moveBlood-Asp
2017-05-31Catch login armor crashBlood-Asp
2017-05-30The MV Chemical Reactor no longer needs plastic.Johannes Gäßler
2017-05-30Fixed a bug where the Chemical Reactor still only had one output slot inJohannes Gäßler
2017-05-30Fixed a bug where the LCM could have a mMaxProgressTime of zero.Johannes Gäßler
2017-05-30Implemented SBR recipes, Added method for LCM recipes, adjustedJohannes Gäßler
2017-05-29Added Materials for Polystyrene, SBR, implemented Polystyrene recipesJohannes Gäßler
2017-05-29Added recipes for the synthetic production of rubber from hydrocarbonsJohannes Gäßler
2017-05-29Added Recipes for Tetranitromethane, made it the additive for NitroFuelJohannes Gäßler
2017-05-29Fixed a bug where cicuit configs for distilleries ranged from 0-10Johannes Gäßler
2017-05-29Changed the Distillation Tower so that it outputs fluids only at theJohannes Gäßler
2017-05-28Added recipes for distilling cracked hydrocarbons, adjusted fuel valuesJohannes Gäßler