Commit graph

2986 commits

Author SHA1 Message Date
Aidan C. Brady
dd254ef326 Better NEI integration, fixed a major issue with the Chemical Washer recipe handler, finished off Solar Neutron Activator 2015-02-27 13:42:38 -05:00
Ben Spiers
f2859cacbb Rename EnergyUtils to UnitDisplayUtils 2015-02-27 17:33:14 +00:00
Ben Spiers
fa9588d557 Add a proper temperature display utility 2015-02-27 17:33:14 +00:00
Ben Spiers
743d80b516 Reduce energy input needed to ignite fusion by factor of 10 2015-02-27 17:33:14 +00:00
Ben Spiers
a478ad0c4f Make statistics tab more explanatory 2015-02-27 17:33:14 +00:00
Aidan C. Brady
c4c2f97170 A few bug fixes 2015-02-27 10:09:28 -05:00
Aidan C. Brady
84ab0ecb3f Lasers now have fancy sound effects! 2015-02-27 01:57:54 -05:00
Aidan C. Brady
48c872ec37 Fixes 2015-02-27 00:47:08 -05:00
Aidan C. Brady
9c7831d07b Work on reactor interface a tad, work on Solar Neutron Activator 2015-02-27 00:28:46 -05:00
Aidan C. Brady
89de5ccea7 More fixes 2015-02-26 22:45:10 -05:00
Aidan C. Brady
341885b2ea Fixed some dropper bugs 2015-02-26 22:28:10 -05:00
Aidan C. Brady
183da4ef75 Finished droppers! 2015-02-26 21:09:04 -05:00
Aidan C. Brady
c39e3d1c1f More dropper work 2015-02-26 20:50:02 -05:00
Aidan C. Brady
49d0a7fc4b Work on droppers! Easiest way to get rid of leftover fluids and gasses in machine gauges. 2015-02-26 19:30:19 -05:00
Aidan C. Brady
7a1085d38d More work 2015-02-26 17:36:24 -05:00
Aidan C. Brady
5767bfb22e Work on Solar Neutron Activator and its recipe system 2015-02-26 17:23:53 -05:00
Aidan C. Brady
74ba02e0bb Polished off the upgrade system - now works consistently and properly for all Mekanism machines. Also, fixed a flamethrower bug 2015-02-26 16:47:36 -05:00
Aidan C. Brady
c7e199b06c Fixed Rotary Condensentrator upgrade inventory 2015-02-26 10:56:12 -05:00
Aidan C. Brady
999502a053 Half-implemented Solar Neutron Activator 2015-02-25 11:11:30 -05:00
Aidan C. Brady
a38090a521 Fixed flamethrower scaling 2015-02-25 10:13:22 -05:00
Aidan C. Brady
1675b9b1cf Flamethrowers now properly check collisions, these things are awesome 2015-02-25 10:02:04 -05:00
Aidan C. Brady
f5dadf443a Merge branch 'master' into development
Conflicts:
	src/main/java/mekanism/api/transmitters/DynamicNetwork.java
2015-02-25 09:16:54 -05:00
Aidan C. Brady
bf42f71b8e Fixed a few crashes 2015-02-25 09:15:08 -05:00
Aidan C. Brady
701cdfd7bd Fixed a crash 2015-02-25 09:05:08 -05:00
Aidan C. Brady
3ba4c738a8 Item reorganization, lithium creation 2015-02-25 09:03:14 -05:00
Aidan C. Brady
955160ff45 Lithium! 2015-02-25 08:44:24 -05:00
Aidan C. Brady
cd25811f31 Fixed Solar Evaporation Controller recipe handler 2015-02-24 19:49:40 -05:00
Aidan C. Brady
62791baec7 Solar Evaporation Plant fixes 2015-02-24 14:11:26 -05:00
Aidan C. Brady
457d465165 Fix a few renames 2015-02-24 11:08:04 -05:00
Aidan C. Brady
888d1bdad8 Deuterium production is complete - use heavy water electrolysis instead of centrifuge recipe 2015-02-24 10:59:03 -05:00
Aidan C. Brady
29e50a34fa Merge branch 'master' into development
Conflicts:
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/item/ItemBlockMachine.java
	src/main/java/mekanism/generators/common/MekanismGenerators.java
2015-02-24 10:42:55 -05:00
Aidan C. Brady
d2f941e630 Recipe fixes, fixed Portable Tank filling 2015-02-24 10:32:41 -05:00
Aidan C. Brady
d432fc979c Merge branch 'master' into development 2015-02-24 08:40:19 -05:00
Aidan
995c798767 Merge pull request #2152 from Dannerick/myDev1
Fix for a gas-generator with empty tank throwing exception (bug #2148)
2015-02-24 08:39:27 -05:00
Brian Lewis
8570748ad9 Fix for a gas-generator with empty tank throwing exception during onChunkLoad (bug #2148) 2015-02-23 10:14:10 -06:00
Aidan C. Brady
98d1a647cb Rename Salination Plant to Solar Evaporation Plant 2015-02-23 08:08:54 -05:00
Aidan
079ca960ee Merge pull request #2128 from chrixian/master
Shift-click items to top (fill) slot
2015-02-20 10:55:07 -05:00
Ben Spiers
dd404b4209 Let's try that again, shall we? Reimplement redstone checks to not load chunks. 2015-02-20 13:56:36 +00:00
Aidan C. Brady
be400ec648 Merge branch 'master' into development
Conflicts:
	src/main/java/mekanism/client/nei/PRCRecipeHandler.java
2015-02-19 18:37:09 -05:00
Aidan C. Brady
b1caa56f5a Fixed PRC gaseous NEI usage lookup 2015-02-19 18:36:08 -05:00
Aidan C. Brady
bf4b74f535 A few fixes 2015-02-19 17:17:28 -05:00
Aidan C. Brady
a9a506fe4a Merge branch 'master' into development 2015-02-19 16:53:15 -05:00
Aidan C. Brady
1e78cbf60e Fixed an impossible crash 2015-02-19 16:53:06 -05:00
Aidan C. Brady
3935fa74c1 Merge branch 'master' into development
Conflicts:
	src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java
2015-02-19 16:38:23 -05:00
Aidan C. Brady
0310cc6f14 Cleanup 2015-02-19 16:37:28 -05:00
Aidan
0e50db9d1a Merge pull request #2140 from Dannerick/MyDev1
Fix for setting generator output when ethylene already in tank when plac...
2015-02-19 16:36:01 -05:00
Aidan C. Brady
ce29270d21 Merge branch 'master' into development 2015-02-19 16:35:09 -05:00
Aidan C. Brady
46f5a941ad Cleanup 2015-02-19 16:34:59 -05:00
Aidan
def3d6a729 Merge pull request #2141 from Dannerick/MyDev2
[#2069] Fix for modded items being added to cardboardbox blacklist
2015-02-19 16:34:00 -05:00
Aidan C. Brady
2fe4cf290d Merge branch 'master' into development (@unpairedbracket, make sure I did this right)
Conflicts:
	src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java
	src/main/java/mekanism/common/util/MekanismUtils.java
2015-02-19 16:12:28 -05:00