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
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
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
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
Aidan C. Brady
b1ebcd0e5e
Merged!
2015-02-10 11:33:28 -05:00
Aidan
48620d77e1
Merge pull request #2099 from RichJeanes/patch-1
...
Update README.md
2015-02-08 16:26:13 -05:00
Aidan
6d5ea1f184
Merge pull request #2112 from Sakarias-Longhorn/patch-1
...
Update fr_FR.lang
2015-02-08 16:25:57 -05:00
Aidan
c635df73eb
Merge pull request #2098 from al-myr/patch-2
...
Update pt_BR.lang
2015-02-08 16:25:51 -05:00
Aidan
4ffd064c06
Merge pull request #2073 from Adaptivity/patch-4
...
Update ru_RU.lang
2015-02-08 16:25:45 -05:00
Aidan
021f7a1bb7
Merge pull request #2062 from BrunoLG/patch-7
...
Update pt_BR.lang
2015-02-08 16:25:40 -05:00
Sakarias Longhorn
cde1ab3967
Update fr_FR.lang
2015-01-29 17:24:43 +01:00
Rich Jeanes
a9e71c985c
Update README.md
...
Grammar
2015-01-22 09:24:17 -07:00
Al
a2d79d5ca5
Update pt_BR.lang
...
Fixed: "Paxel"
Minecraft vanilla:
item.leggingsCloth.name=Leather Pants
item.leggingsCloth.name=Calça de Couro (pt_BR)
2015-01-21 09:37:08 -03: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
1a6a2e9530
Update version number.
...
I'm going to use GitHub's release feature until the build server's fixed.
2015-01-10 17:13:35 +00:00
Ben Spiers
143c968a8a
Update some deps to see if the buildserver's fixed yet
2015-01-10 03:19:31 +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
aa91fa87a6
Update some dependencies.
2015-01-08 05:27:08 +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
Anton
36d3d1bdb2
Update ru_RU.lang
2015-01-05 18:22:34 +03:00
