Commit graph

22 commits

Author SHA1 Message Date
AlgorithmX2
1632d2d72e Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
Conflicts:
	items/tools/powered/ToolMassCannon.java
2014-06-16 00:51:51 -05:00
AlgorithmX2
4763069fab Removed Vec3Pool 2014-06-13 12:42:09 -05:00
AlgorithmX2
f6d7762725 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
Conflicts:
	items/tools/powered/ToolMassCannon.java
2014-06-04 23:05:22 -05:00
AlgorithmX2
1ab7f7c110 Ditch AABBPool 2014-06-04 22:59:56 -05:00
AlgorithmX2
6485026235 Matter Cannon Compiles with Changes.
Disabled Paint Balls for now.. not sure I'm going to have the drive to finish that stuff.
2014-06-02 19:32:38 -05:00
AlgorithmX2
384df1c18b Almost compiles again... 2014-06-02 00:37:13 -05:00
AlgorithmX2
8183becfd4 Paint Balls. 2014-05-31 20:50:56 -05:00
AlgorithmX2
e35924b8fa API Sync. 2014-03-28 13:58:21 -05:00
AlgorithmX2
404cc08128 API"ed the Storage Cell Classes. 2014-03-27 19:48:38 -05:00
AlgorithmX2
792249f8fd Added Sky Stone Tracking.
Added Meteorite Compass Block / Item.
Added Meteorite Spawner Debug Item.
Some Refactoring.
2014-03-02 02:35:11 -06:00
AlgorithmX2
1b6e2bd2c3 Entropy Manipulator Can now be dispensed.
Matter Cannon Can now be dispensed.
2014-02-27 01:10:45 -06:00
AlgorithmX2
cf6b0986fc Fortify ItemLists. 2014-02-21 14:36:40 -06:00
AlgorithmX2
713b137b53 Matter cannon knock back fixed. 2014-02-15 22:35:19 -06:00
AlgorithmX2
5f8570abdc Rename Configuration to AE Config 2014-02-08 23:08:27 -06:00
AlgorithmX2
d50c7f6312 Ported to 1.7 2014-02-08 19:34:52 -06:00
AlgorithmX2
b57804be06 Removed Localization Stuff.
Added Logging Option.
Logging of Exceptions is now done via AELogger
2014-02-07 14:37:22 -06:00
AlgorithmX2
6de529a889 Wireless Terminal now respects WAPs and distances.
Finished Wireless Terminal.
Added WAP Gui.
Added Battery Config.
Added Wireless Config.
Fixed bug with dense cable channels, and the controller.
2014-02-03 22:23:14 -06:00
AlgorithmX2
ee99dce791 Removed All Incomplete Items From Build.
Fixed Security GUI leaking into other Guis.
Fixed Bug in AE Fluid Stacks.
Fixed Power Drain in Matter Cannon if there is no ammo.
Fixed Not being able to store empty storage cells in Portable Cell.
Fixed Red Background on Upgrade Slots.
2014-02-01 12:13:12 -06:00
AlgorithmX2
6ecb969801 Fixed Priority Order, Added Read/Write and some refactoring. 2014-01-26 00:48:09 -06:00
AlgorithmX2
42424f80c8 Refactoring API stuff 2014-01-23 13:02:48 -06:00
AlgorithmX2
834e9c04c5 Err too much. 2014-01-20 10:41:37 -06:00
algorithmx2
e9acdcbee2 AE2 First Commit, the dawn of 1.7 hast arrived. 2013-12-27 16:59:59 -06:00