Aidan C. Brady
ac16039ecf
Merge branch 'master' into development
...
Conflicts:
common/mekanism/client/render/MekanismRenderer.java
common/mekanism/common/Mekanism.java
common/mekanism/common/integration/OreDictManager.java
common/mekanism/common/network/PacketPortableTeleport.java
common/mekanism/common/tile/TileEntitySalinationController.java
common/mekanism/generators/common/MekanismGenerators.java
common/mekanism/tools/common/MekanismTools.java
2014-03-07 21:39:13 -05:00
Victor Robertson
e5a6eadc45
Fix indentation and remove trailing whitespace
...
This patch provides common/mekanism/*.java with standardized
indentation (tabs) and also removes trailing whitespace.
2014-03-07 19:20:35 -06:00
Aidan C. Brady
8b70e0d50d
v6.0.4 push
2014-03-07 10:46:43 -05:00
Victor Robertson
9e1b8f55f9
Add MekanismTool balance configuration
...
Previously, the values for tool damage, efficiency, enchantability,
harvestLevel, and maxUses as well as values for armor durability,
enchantability, and reduction amounts were hard-coded. Now they
are configurable via the Mekanism configuration file.
2014-03-03 05:00:22 -06:00
Aidan Brady
8070b3ebd7
Bump version to 6.0.3
2014-03-01 11:12:04 -05:00
Aidan Brady
d3a3c39221
Fix panel harvest levels
2014-03-01 11:08:32 -05:00
Aidan Brady
84d300993b
Fix a teleporter issue, bump version number to 6.0.2
2014-02-22 13:58:35 -05:00
Aidan C. Brady
95698e45ea
Kill off old induction stuff, bump version to 6.0.1
2014-02-16 23:50:56 -05:00
Aidan C. Brady
f0e5c7c468
General cleanup
2014-01-08 18:28:17 -05:00
Aidan Brady
4ab61c856f
Organized some classes, began work on balloon entity connections
2014-01-07 20:55:50 -05:00
Aidan Brady
1835f6ff91
Update TE, add module config syncing
2014-01-03 14:26:41 -05:00
Aidan Brady
40e2d3b7fc
Bump version, work on multipart transporters
2013-12-20 16:47:09 -05:00
Aidan C. Brady
869660d8bf
Glowstone armor now glows
2013-12-16 12:21:49 -05:00
Aidan C. Brady
14d557cbe5
Some work on things, got rid of version constants, they're supposed to differ per module.
2013-11-20 11:01:13 -05:00
Calclavia
e986b3e664
Can't believe Aidan never used constants for Mekanism's versions
2013-11-20 20:26:51 +08:00
Aidan Brady
a29b637a0a
Minor tool cleanups
2013-11-13 22:43:58 -05:00
Aidan Brady
d08c6da830
Fixed tool harvest levels
2013-11-13 17:21:00 -05:00
Aidan C. Brady
6837b1fb66
Bumped version!
2013-10-29 19:31:26 -04:00
Aidan C. Brady
0350eef398
Minor changes
2013-10-18 07:33:27 -04:00
Ben Spiers
189c6d4551
L10n support by popular demand. Closes #204
2013-10-12 16:43:56 +01:00
Aidan C. Brady
6af0b1abd7
Screw it, package organization (sorry, that's an API update)
2013-08-26 18:49:32 -04:00
Ben Spiers
1b64d077e4
@Aidancbrady, why did osmium armour think it's made of diamond? I've
...
changed it because it was messing with the textures.
2013-07-31 23:34:39 +01:00
Ben Spiers
7c71adc9d2
Well, I don't know why the old way was broken but it's fixed now.
2013-07-31 23:34:39 +01:00
Aidan Brady
5d26f8e229
Updated to new UE, not done with complete implementation
2013-07-26 18:16:21 -04:00
Aidan Brady
13400fdc3d
Bumped version to 5.5.7
2013-07-20 12:35:37 -04:00
Aidan Brady
b255a98a74
Rebase for new workspace (sorry)
2013-06-28 18:01:00 -04:00
