Commit graph

20 commits

Author SHA1 Message Date
Ben Spiers
f0ad905c07 Merge branch '1.7.10' into development
Conflicts:
	build.properties
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/voice/VoiceConnection.java
2014-07-07 15:43:53 +01:00
Aidan C. Brady
b387c8529d Bumped version to 7.0.0, a few fixes and enhancements 2014-06-06 00:16:36 +02:00
Ben Spiers
fd425b3146 I hereby declare this Mekanism 6.1.0! 2014-04-19 20:49:58 +01:00
Aidan C. Brady
4f69850f17 v6.0.4 release 2014-03-08 16:26:36 -05:00
Aidan Brady
8070b3ebd7 Bump version to 6.0.3 2014-03-01 11:12:04 -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
Ben Spiers
3d89829278 Fix macquotes in mcmod.info files. 2014-01-10 02:16:39 +00:00
Aidan C. Brady
3a5e182f39 I guess I don't need CCL 2014-01-05 00:44:32 -05:00
Aidan C. Brady
ae38aef7b8 Hopefully get that manifest working 2014-01-05 00:37:09 -05:00
Aidan C. Brady
d32537370c Force a manifest 2014-01-05 00:33:27 -05:00
Aidan Brady
537e599710 DepLoader, hope this works 2014-01-04 14:57:44 -05:00
Aidan Brady
40e2d3b7fc Bump version, work on multipart transporters 2013-12-20 16:47:09 -05:00
Aidan Brady
fe33689d13 Fixed OS X quote characters 2013-11-17 11:59:58 -05:00
Aidan C. Brady
3ec8a3bdb1 Modify build to package MekanismInduction 2013-11-16 13:04:06 -05:00
Ben Spiers
9c0b2a56b5 Update to 1.6.4. I hope this works. 2013-09-28 03:37:48 +01:00
Aidan Brady
13400fdc3d Bumped version to 5.5.7 2013-07-20 12:35:37 -04:00
Aidan Brady
44be9a19b9 v5.5.6 Beta #1
*Added Robit.
*Added Chargepads.
*Fixed swords not able to be enchanted.
*Energy displayed in tooltip when mouse hovering over display bar on
GUIs.
*General cleanups.
*Fixed incorrect machine inventory configuration.
2013-05-19 18:43:01 -04:00
Aidan Brady
b7c1a7afc6 v5.5.5 Pre-Release #1
*Code claeanups.
*Bumped all MC versions to 1.5.2.
*Fixed teleporters teleporting in-block.
*Added Thermal Expansion charging/discharging support.
*Fixed Coal Ore Enrichment Chamber recipe.
*Added Compressed Carbon recipe for Charcoal.
2013-05-09 08:56:36 -04:00
Aidan Brady
557d12bc0c v5.5.5 Beta #1
*Version bumped to v5.5.5.
*Fixed API bug.
*New item charging system.
*Began removing UE references for reliancy.
2013-04-23 15:36:43 -04:00
Aidan Brady
0bf90e75d9 Attempted Jenkins builds 2013-04-13 11:42:11 -04:00