Commit graph

41 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
95ebaa439e Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-03 08:50:41 -05:00
AlgorithmX2
a71d8047b4 Hide getManager(ItemStack itemStack) from non IC2 Code. 2014-06-03 08:39:46 -05:00
AlgorithmX2
a1af4443b7 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-02 19:32:51 -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
a82a03f3b9 IC2 Charging Re-Implemented. 2014-06-02 11:23:47 -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
161f88e42c Added Paint Balls.
Added Color Applicator.
2014-05-26 03:26:37 -05:00
AlgorithmX2
08d6942643 Added all the crafting cpu "blocks" - needs textures and renders.
Updated API
2014-05-10 00:00:02 -05:00
AlgorithmX2
5248eeeace Switched from FML Optional to AE Optional, lets me specify more interesting requirements for integration, and lets the config alter the resulting integration setup. 2014-04-06 01:55:24 -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
4536189042 Added Sky Stone Dust.
Added View Cell.
Configure View Cell in Cell Workbench.
View Cell Can Filter Terminals by being inserted into the Side Slot.
2014-03-04 01:52:07 -06: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
a8da212c46 DERP! 2014-02-16 18:51:19 -06:00
AlgorithmX2
646dafcc99 Moved Sorting Config Into the World. 2014-02-16 18:50:25 -06:00
AlgorithmX2
713b137b53 Matter cannon knock back fixed. 2014-02-15 22:35:19 -06:00
AlgorithmX2
dcf23f4c03 Entropy Manipulator Fixes. 2014-02-14 21:16:44 -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
b7d90b989d Begin work on Wireless Terminal Gui. 2014-02-02 22:33:50 -06:00
AlgorithmX2
af8e356bec Wireless block no uses placed side to orient, this is more natural for it instead of the place based version.
Added Wireless Encoder Gui to the Security Term
Security Term now only accepts Biometric Cards in the config slot.
Added Wireless Block.
Added Wireless Terminal.
Fixed Crash when loading world settings.
Configure slot of Security Block now drops on destruction.
2014-02-02 01:32:10 -06:00
AlgorithmX2
a9efb2f17b Portable Cells can no store empty storage cells. 2014-02-01 16:25:56 -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
c981c637f9 Massive Localization Update. 2014-01-30 12:54:32 -06:00
AlgorithmX2
771ba23c0d Fixed Entropy manipulator power usage case. 2014-01-30 12:50:49 -06:00
AlgorithmX2
9a64980443 Build Script Update.
FMP Fixes
Optional Interfaces for BC
Optional Interfaces for IC2
Removed UE Api on Items
Proxied Effect for C-CQuartz
2014-01-28 11:29:17 -06:00
AlgorithmX2
6ecb969801 Fixed Priority Order, Added Read/Write and some refactoring. 2014-01-26 00:48:09 -06:00
AlgorithmX2
db67edffb8 Api Tweak 2014-01-23 13:41:11 -06:00
AlgorithmX2
42424f80c8 Refactoring API stuff 2014-01-23 13:02:48 -06:00
AlgorithmX2
dfbc8a6c79 ME Tunnel + Network Tool 2014-01-23 10:28:12 -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