Commit graph

33 commits

Author SHA1 Message Date
Ben Spiers 249638ef41 Fix somehow having 2 mcmod.info files in the Mekanism jar. 2014-07-14 20:41:13 +01:00
Ben Spiers f26c49d6b4 Add a mcmod.info for development purposes. 2014-07-07 21:23:04 +01:00
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 c9ce7f1983 Hopefully got NEI to download 2014-06-13 19:45:28 +02:00
Aidan C. Brady 96973190b7 Another fix 2014-06-13 11:39:04 +02:00
Aidan C. Brady df13fd4d02 Hopefully fixed build 2014-06-13 11:37:08 +02:00
Aidan C. Brady 704b3e2ac1 Attempt to fix build script 2014-06-13 01:29:27 +02:00
Aidan C. Brady 9a16625585 Updated build.gradle 2014-06-03 00:25:46 +02:00
Ben Spiers ab47724473 Move the directory structure around to a more conventional one and start out on the 1.7 update.
3797 errors. We have a long way to go.
2014-04-20 03:44:06 +01:00
Ben Spiers fd425b3146 I hereby declare this Mekanism 6.1.0! 2014-04-19 20:49:58 +01:00
Ben Spiers 1a111cc9dd Update FMP, allow sided hollow-cover behaviour. 2014-04-08 02:15:38 +01:00
Aidan C. Brady 8b70e0d50d v6.0.4 push 2014-03-07 10:46:43 -05:00
Aidan Brady 8070b3ebd7 Bump version to 6.0.3 2014-03-01 11:12:04 -05:00
Aidan Brady 5af38f38d9 v6.0.2 release 2014-02-22 14:02:10 -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 Brady db7d4ad681 v6.0.1 bump 2014-02-17 13:04:58 -05:00
Aidan C. Brady a231e18b13 Whoops! Mekanism should load now... 2014-01-05 00:48:58 -05:00
Aidan C. Brady 56f3c7f79a Hopefully that'll do it! 2014-01-05 00:40:12 -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 C. Brady f2b4849844 Hopefully get a load plugin working 2014-01-05 00:28:20 -05:00
Ben Spiers 392f930a84 Hopefully make gradle delete the everything jar after building and extracting the other jars. 2014-01-05 00:32:14 +00:00
Aidan Brady 0dd45ef9bb Undo the attempt, I’ll leave this up to you @unpairedbracket 2014-01-04 18:56:06 -05:00
Aidan Brady 05bbcd4a48 Attempt to remove MekanismAll, I really have no idea what I’m doing though
Also kill copied ItemMultiPart
2014-01-04 18:50:13 -05:00
Ben Spiers 709ae894c0 Make gradle put jars in the same places as ant and put together MDK zips, and version them properly. It also reobfuscates JItemMultipart subclasses properly if that's what you were fighting with, @aidancbrady. 2014-01-04 21:22:02 +00:00
Aidan Brady 7c0ed22cc8 Fixes 2014-01-04 13:33:52 -05:00
Aidan Brady 62eb4f63fd Lies -> 2014-01-04 13:29:55 -05:00
Aidan Brady 255f2dc4e6 Another build attempt 2014-01-04 13:28:29 -05:00
Aidan Brady 64e8dbeb2c Fix bad characters 2014-01-04 13:25:12 -05:00
Aidan Brady 72fe9ac1bc Call releaseJars 2014-01-04 13:24:12 -05:00
Aidan Brady 36c6b8cab5 Build work 2014-01-04 13:14:19 -05:00
Aidan C. Brady c824aea5d4 Start work on inverse DM filter system 2014-01-04 01:41:43 -05:00
Ben Spiers 14b9d7b22d Gradilisation, without moving everything around because that's annoying and makes merges difficult, and this way ant will still work as well.
`gradle :build` builds MekanismAll.jar (couldn't make it do separate ones on its own)
`gradle :releaseJars` generates MekanismCore, MekanismGenerators and MekanismTools.
It would be helpful if anyone has a maven repository of CB's mods...
2013-12-29 20:45:36 +00:00