Commit graph

54 commits

Author SHA1 Message Date
Aidan C. Brady
d1c193d0dd Loads more work. 275 errors. 2014-05-29 19:01:43 +01:00
Aidan Brady
6025572f15 Merge branch '1.7' into development (We're back to two branches)
Conflicts:
	build.properties
2014-05-08 17:40:27 -04:00
Ben Spiers
db7121454a Re-add an updated ic2, alter CC and update DepLoader. Fix more of the things.
1792 errors. A good night's work, I think.
2014-04-20 04:34:19 +01: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