Ben Spiers
743d80b516
Reduce energy input needed to ignite fusion by factor of 10
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
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
81c948f28d
Fixed capes
2015-02-11 08:36:52 -05:00
Aidan C. Brady
086dd83a57
Fixed capes
2015-02-11 08:36:40 -05:00
Aidan C. Brady
50f7df5f98
Merge branch 'development' into v8
...
Conflicts:
build.properties
src/main/java/mekanism/api/gas/GasNetwork.java
src/main/java/mekanism/api/transmitters/DynamicNetwork.java
src/main/java/mekanism/client/ClientTickHandler.java
src/main/java/mekanism/common/EnergyNetwork.java
src/main/java/mekanism/common/FluidNetwork.java
src/main/java/mekanism/common/Mekanism.java
src/main/java/mekanism/common/recipe/RecipeHandler.java
src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java
src/main/java/mekanism/generators/common/MekanismGenerators.java
src/main/java/mekanism/generators/common/block/BlockGenerator.java
2015-02-10 18:39:15 -05:00
Aidan C. Brady
d8e12ca8d2
Merge branch 'development' into v8
...
Conflicts:
src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
src/main/java/mekanism/generators/common/block/BlockGenerator.java
2015-02-10 11:38:13 -05:00
Ben Spiers
3e38ac37f4
This feature request has been more trouble than it's worth.
2015-01-19 12:16:04 +00:00
Ben Spiers
2ced2e3860
Fix the bad implementation of the ambient lighting toggle
2015-01-19 12:07:54 +00:00
Ben Spiers
1f9185dd01
Make the gas mask and jetpack maps synchronized
2015-01-10 18:17:17 +00:00
Ben Spiers
89be8b4482
Fix using localised names for overlay textures.
2015-01-10 17:47:16 +00:00
Ben Spiers
b8b49db104
It seems the Heat Transfer equations I'm using are a bit stiff.
...
Adjust some paramaters some to improve how well we deal with this.
2015-01-09 02:50:18 +00:00
Ben Spiers
385a1d29f6
Make a start on the boiler.
...
It's currently causing odd issues with the heat simulator and has various issues such as balance not existing yet.
Also improve the specification of a load of the multiblock generics to reduce needless casting.
2015-01-08 05:26:53 +00:00
Ben Spiers
c0db6b7eb5
Fix #2075 , hopefully.
2015-01-07 23:58:23 +00:00
Ben Spiers
41cf1a2437
Move a bunch of registrations to PreInit.
...
I believe they should be happening there in the first place.
2015-01-07 23:13:45 +00:00
Ben Spiers
4b75a2f6a2
Hopefully improve the synchronization of the networks' transmitter sets
2015-01-07 23:13:10 +00:00
Ben Spiers
fdde129180
Obfuscate password entry
2014-12-28 23:01:26 +00:00
Ben Spiers
3d4636d8da
Config option for generator lighting
2014-12-27 21:37:20 +00:00
Ben Spiers
f419c4e6d5
Fix anvil and snow pickup
2014-12-27 21:26:20 +00:00
Ben Spiers
aea27f3bd6
Merge pull request #2029 from SoraZodia/master
...
@Interface removal for IPipeTile
2014-12-27 21:17:42 +00:00
Ben Spiers
f63807c75a
Fix some transmitter issues.
2014-12-27 21:09:34 +00:00
Ben Spiers
ccf7a37b22
Make HeatUtils not take unnecessary arguments.
2014-12-27 21:08:18 +00:00
Ben Spiers
d4f48401d3
Merge branch 'development' into v8
2014-12-22 23:46:17 +00:00
Ben Spiers
c77e84ca6c
Make cyan brighter
2014-12-22 23:41:33 +00:00
Ben Spiers
fe2c22862a
Fill in some machines' type arguments.
2014-12-22 23:40:51 +00:00
Ben Spiers
00fa5ccbe6
Make the heat methods not crash.
2014-12-22 23:40:29 +00:00
Ben Spiers
37e35d5943
Make loading the reactor from file update the "last" temperatures.
2014-12-22 23:40:03 +00:00
Ben Spiers
f3d9faff6b
Make it dangerous to be in the reactor while it is at >100million degrees, and full of burning plasma.
2014-12-22 23:38:32 +00:00
Ben Spiers
bc1ef33cd6
Make unforming the fusion reactor stop the burn.
2014-12-22 23:36:37 +00:00
Ben Spiers
7296c3dbcb
Reactors now a Heat source. Awaiting Balance.
2014-12-22 21:30:45 +00:00
Ben Spiers
3544addf20
Make heat generator not lose energy when below ambient temperature, and use the Carnot Engine equations for efficiency.
2014-12-22 20:10:01 +00:00
