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 |
|
|
Ben Spiers
|
17f9f88b34
|
Prevent Osmium Compressor and Combiner from using secondary energy upgrades.
Also make them deterministic again to prevent them getting stuck
|
2015-02-19 16:36:16 +00:00 |
|
|
Aidan C. Brady
|
cb377f88ab
|
Fixed duplicate method
|
2015-02-19 09:15:56 -05:00 |
|
|
Aidan C. Brady
|
f67c048e78
|
Merge branch 'master' into development
Conflicts:
src/main/java/mekanism/common/multipart/PartSidedPipe.java
|
2015-02-19 09:15:30 -05:00 |
|
|
Aidan C. Brady
|
c59b64f7c9
|
Merged changes
|
2015-02-19 09:15:00 -05:00 |
|
|
Aidan C. Brady
|
0819c0ad5f
|
Hopefully fixed the transmitter network halt issue. Provide feedback!
|
2015-02-19 09:13:03 -05:00 |
|
|
Aidan C. Brady
|
f7f4bd7243
|
Fixed Heat Generator burn time
|
2015-02-19 09:00:20 -05:00 |
|
|
Aidan C. Brady
|
b419519cc0
|
Chemical Infuser, Chemical Washer and Electrolytic Separator are now upgradeable
|
2015-02-18 19:33:03 -05:00 |
|
|
Brian Lewis
|
e842556c5b
|
[#2069] Fix for modded items being added to cardboardbox blacklist
|
2015-02-18 17:30:09 -06:00 |
|
|
Brian Lewis
|
d41fec6031
|
Fix for setting generator output when ethylene already in tank when placed
|
2015-02-18 17:25:16 -06:00 |
|
|
Aidan C. Brady
|
f320aa4337
|
Merge branch 'master' into development
|
2015-02-17 21:35:01 -05:00 |
|
|
Aidan C. Brady
|
dcf7d7772a
|
Fixed a transporter output bug
|
2015-02-17 21:34:36 -05:00 |
|
|
Aidan C. Brady
|
25df777b84
|
Work on fusion fuel creation mechanics, allowed Chemical Washer to accept upgrades
|
2015-02-17 21:27:35 -05:00 |
|
|
Aidan C. Brady
|
cb2e38ec61
|
Merge branch 'master' into development
Conflicts:
src/main/java/mekanism/common/tile/TileEntityBasicBlock.java
|
2015-02-16 18:13:03 -05:00 |
|
|
Aidan C. Brady
|
488af7e8ae
|
Fixed facing updates not being sent out by machines
|
2015-02-16 18:12:31 -05:00 |
|
|
Aidan C. Brady
|
d33af99b87
|
More cleanup
|
2015-02-16 18:11:45 -05:00 |
|
|
Aidan C. Brady
|
548145ae02
|
Revert "Revert "Fix some transmitter issues.""
This reverts commit e9ef6c1866.
|
2015-02-16 17:24:51 -05:00 |
|
|
Aidan C. Brady
|
e9ef6c1866
|
Revert "Fix some transmitter issues."
This reverts commit f63807c75a.
|
2015-02-16 17:21:39 -05:00 |
|
|
Aidan C. Brady
|
03f6156d23
|
Minor cleanup
|
2015-02-16 17:20:51 -05:00 |
|
|
Aidan C. Brady
|
3561f9fe59
|
Merge branch 'master' into development
Conflicts:
src/main/java/mekanism/common/Mekanism.java
src/main/java/mekanism/generators/common/MekanismGenerators.java
src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java
src/main/java/mekanism/tools/common/MekanismTools.java
|
2015-02-16 14:40:10 -05:00 |
|
|
Aidan
|
b885742690
|
Merge pull request #2001 from Dannerick/master
Fix for #1997 gasGenerators incorrectly limiting output
|
2015-02-16 14:32:52 -05:00 |
|
|
Ben Spiers
|
0cef749249
|
Actually increment the Mod classes' versions
|
2015-02-13 14:40:14 +00:00 |
|
Christian Ehrhardt
|
db4adce2a8
|
Shift-click items to top (fill) slot
|
2015-02-12 19:18:16 -06:00 |
|
|
Aidan C. Brady
|
2796a5d67b
|
Merge branch 'master' into development
Conflicts:
src/main/java/mekanism/api/transmitters/DynamicNetwork.java
src/main/java/mekanism/client/ClientTickHandler.java
|
2015-02-12 13:10:55 -05:00 |
|
|
Ben Spiers
|
7e08643ebd
|
ConcurrentHashMaps don't like null keys
|
2015-02-12 16:59:39 +00:00 |
|
|
Ben Spiers
|
122f4190bd
|
Remove some bad/unneeded imports
|
2015-02-12 16:42:25 +00:00 |
|
|
Ben Spiers
|
e6a4d3efb2
|
Screw it, let's just make these concurrent.
Keeping transmitters as a synchronizedSet-wrapped LinkedHashSet for now, because there isn't a ConcurrentLinkedHashSet.
|
2015-02-12 16:39:48 +00:00 |
|
|
Aidan C. Brady
|
0612712abe
|
Fixed energy cubes not outputting items
|
2015-02-11 08:43:32 -05:00 |
|
|
Aidan C. Brady
|
84cdf8e92b
|
Merge branch 'master' into development
|
2015-02-11 08:37:32 -05:00 |
|