tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity
1417 commits 7 branches 98 tags 24 MiB
Commit graph

206 commits

Author SHA1 Message Date
AlgorithmX2
161f88e42c Added Paint Balls. 
Added Color Applicator.
 2014-05-26 03:26:37 -05:00
AlgorithmX2
ef7a1592e7 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-25 18:35:44 -05:00
AlgorithmX2
6b0fa0f142 Clear Memory Card When Shift Clicking on a non-machine / air. 
Fixed Tooltip to properly localize names.
 2014-05-25 18:32:16 -05:00
AlgorithmX2
fa376237fd remove unused variable, and added lumen cable. 2014-05-25 17:43:17 -05:00
AlgorithmX2
ec3cb8737a Crafting patterns are not iron nuggets 2014-05-19 23:12:49 -05:00
AlgorithmX2
d10e7ee6df Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-15 09:35:56 -05:00
AlgorithmX2
9ba1b133d7 Fixed Bug: #0432 - Weird Inventory behavior in Quartz Cutting Knife 
Removed logging from Migration Items.
Improved logging for http://openeye.openmods.info/crashes/42defba4fcc4c4571a45edaaba3af4c3
Improved logging for http://openeye.openmods.info/crashes/cbda180edb2fba39c4fe27a7f5266fec
 2014-05-14 10:55:45 -05:00
AlgorithmX2
25a588f303 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 
Conflicts:
	container/AEBaseContainer.java
	core/sync/AppEngPacketHandlerBase.java
 2014-05-13 19:25:07 -05:00
AlgorithmX2
14b7fe8a42 Add better custom security features. 2014-05-12 23:15:46 -05:00
AlgorithmX2
9f0e31b303 prevent crash with derpy facades. 2014-05-11 17:01:48 -05:00
AlgorithmX2
bd5e80fba1 Facades should use names, not ids. 2014-05-11 11:41:31 -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
f031972fcd Started working on crafting infrastructure and C-Cpus 2014-05-08 23:10:12 -05:00
AlgorithmX2
3351af3d4e Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 
Conflicts:
	items/materials/MaterialType.java
	util/Platform.java
 2014-05-06 20:45:38 -05:00
AlgorithmX2
93aad6c53b Fixed Crash with Extra Utilities. 
Items in the ore dictionary values no longer fail to migrate.
Fixed "Meta Overlap detected" error.
Recipes now work with new Materials/Parts.
 2014-05-06 12:08:48 -05:00
AlgorithmX2
e60faf5ab0 Remove Meta values from Config. 
Fixed a number of rendering gltiches with Smart/Covered Cables
 2014-05-06 00:16:29 -05:00
AlgorithmX2
4d5a6ce301 Add Stained Glass facades. 
The Item Bus Renderer can now deal with Alpha Pass.
 2014-05-04 15:46:38 -05:00
AlgorithmX2
3c510b6925 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 
Conflicts:
	core/localization/GuiText.java
	core/sync/AppEngPacketHandlerBase.java
 2014-05-03 14:12:19 -05:00
AlgorithmX2
b9ef599e13 Network tool can now lock Storage/Conversion Monitors. 
Buckets no longer place when trying to insert them into a network via Conversion Monitor.
 2014-05-03 02:51:56 -05:00
AlgorithmX2
cd5e4caf7b Added P2P RF Tunnel. 
Added Added thread local for network recursion for later ( 1.8 ).
 2014-05-02 00:00:14 -05:00
AlgorithmX2
8a9136cbb3 Attempt Number two are making config generation consistent. 2014-04-28 15:00:53 -05:00
AlgorithmX2
c72ce5ba06 Prevent Materials from crashing if they are disabled. 2014-04-27 23:50:26 -05:00
AlgorithmX2
f21bf3e9bc Added Basic Restrictions on slots in MAC. 2014-04-24 20:55:29 -05:00
AlgorithmX2
589e2d60d2 Pattern slots now report the output qty as well as the item type, at all times ( not just when shift is held ) 2014-04-23 00:30:29 -05:00
AlgorithmX2
85f15e7c06 Pattern Renderer ( for shift ) 2014-04-22 20:36:26 -05:00
AlgorithmX2
67d46d57d2 Patterns can now be encoded. 
Added a clear button to the Pattern Terminal.
Added description to the Encoded Pattern Item.
 2014-04-17 01:15:56 -05:00
AlgorithmX2
7dc251611c tiny progress... 2014-04-08 21:56:59 -05:00
AlgorithmX2
ee42c53f89 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-04-06 14:12:52 -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
97c06db6ef Use ordinal of parts/items as the default meta, allows for holes in the setup but lets default configs be consistent regardless of other mods. 2014-04-06 01:51:44 -05:00
AlgorithmX2
efa931a7a1 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-04-05 15:30:09 -05:00
AlgorithmX2
26b1a2abf9 Fixed Bug: #0267 - Improved Arbitrary rotation? 2014-03-31 22:24:28 -05:00
AlgorithmX2
34b81439f4 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 2014-03-29 03:55:11 -05:00
AlgorithmX2
35afab233e Fixed Bug: #0254 - Icon of Crystal Seeds overlapping durability bar 2014-03-29 03:55:02 -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
2c4add0fdf Crafting Begin. 2014-03-25 22:06:54 -05:00
AlgorithmX2
2262df019e Fixed Creative Tab. 2014-03-19 20:33:28 -05:00
AlgorithmX2
06903814ad Added Facade Crafting. 2014-03-15 15:35:00 -05:00
AlgorithmX2
d4ff8e731d Added Meteorite Spawn Distance Setting. 
Added Charged Quartz Spawn Chance.
All GUI's Parts/Tiles support Custom Localization. ( Fixes #0190 )
Added Crafting Recipe for copying Press Plates.
Fixed Bug: #0189 - Particles don't turn off when set to minimal
Fixed Bug: #0176 - Weird Colorization While Mining Parts.
Fixed Bug: #0152 - TPane drops parts as items and does not insert into system.
Fixed Bug: #0140 - Spatial pylon facade renders oddly (Clear)
 2014-03-15 01:58:21 -05:00
AlgorithmX2
c0e43fe087 Rename Seed Textures. 2014-03-11 21:26:03 -05:00
AlgorithmX2
2e9d6641fe Fixed a bug with shift clicking. 
Added Quartz Knife Gui.
You can now make name presses with the quartz knife.
Added Inscriber Recipes.
Fixed Bug with Spatial Dim Registrations.
 2014-03-06 21:02:15 -06:00
AlgorithmX2
adb03c45c6 Added Current/Max Power to Network Tool. 
Added Current/Max Power to Spatial IO Port.
Added Required/Efficiency to Spatial IO Port.
Added Power Unit Button / Setting.
Fixed bug with Meteorite and Spatial IO.
Removed Random Logging in Spatial IO.
 2014-03-05 23:45:14 -06:00
AlgorithmX2
040e948d8e Removed Dropped Features. 
Implemented Spatial Storage.
Fixed bug with ME Chest saying the cell was un-readable.
 2014-03-05 01:27:42 -06: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
9161ad0c13 Added Items, Fixed Some Recipe handler errors, and fixed Parts not saving. 2014-02-25 22:34:05 -06:00
AlgorithmX2
9575c8872c Implemented Recipe Groups. 
Added ISubItemResolvers.
ItemSeeds now use Constants instead of raw integers.
 2014-02-24 23:33:31 -06:00
AlgorithmX2
ca64bacd17 Moved Facade Registration to Init. 
Removed Urainum Drop Ammo.
Storage Cells can now be dismantled and re-assembled.
Removed IC2 P2P Logging.
 2014-02-24 21:55:09 -06:00
AlgorithmX2
1a75097e84 Removed Block Definitions for MAC Parts. 
Removed Options For MAC and Crafting.
Added Options for Crafting with Quartz Growth and Fluix Reaction.
EU Tunnels Re-Added ( Limit 1 per block. )
Adjusted naming/categorization of various features.
Added "sparkle" effect to seeds that are "growing"
 2014-02-23 16:50:53 -06:00
AlgorithmX2
15f300c553 Removed Purify Crafting Handler. 
Added Crystal Growth ( for Nether, Certus, and Fluix. )
Added Macerator Crafting Handler.
Added Pulverizer Crafting Handler.
Implemented Grid Crafting Handler.
Formation Planes now eject items in a more consistent manner.
Formation Planes can now place, or eject into replaceable blocks ( air/grass/fluids )
 2014-02-23 00:55:46 -06:00
AlgorithmX2
e94b0bbe60 Re-Enabled IC2 API. 
Relocated Entity Package.
Removed Blank Patterns Item.
 2014-02-22 19:28:52 -06:00
AlgorithmX2
cf6b0986fc Fortify ItemLists. 2014-02-21 14:36:40 -06:00
AlgorithmX2
b23aab81e6 Memory Card can now be used on most Blocks/Parts to save/load settings. 2014-02-19 23:18:49 -06:00
AlgorithmX2
da8677b70a Formation Plane Added. 2014-02-17 23:51:31 -06:00
AlgorithmX2
2f056ba3b0 MJ Tunnel Enabled. 2014-02-17 21:41:19 -06:00
AlgorithmX2
0de3b93193 Monitior -> Monitor 2014-02-17 20:56:17 -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
02f2eb00bd Network tool is now powered by black magic. 2014-02-16 15:28:50 -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
df7b9389e8 NBT Items are now ignored for facades. 2014-02-14 21:16:05 -06:00
AlgorithmX2
07b1bb8473 Added Annihilation Plane. 2014-02-13 22:27:15 -06:00
AlgorithmX2
4a87ceac4f Recipe Engine Added, not quite done yet tho. 2014-02-09 21:16:36 -06:00
AlgorithmX2
49da876b6f Fixed an issue where Parts/Blocks would not properly identify them selves with the proper ItemStack. 2014-02-09 01:55: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
9f070c19c6 Opps. 2014-02-07 13:30:08 -06:00
AlgorithmX2
e436dca760 Fixed bug with Energy Inject/Extract Averages. 
SideOnly All the things.
Pulled Rendering for CableContainers out into a Proxy.
 2014-02-06 23:51:19 -06:00
AlgorithmX2
28fa9bfc5a Tweaked Biometric Cards for Sorting purposes. 2014-02-05 23:17:06 -06:00
AlgorithmX2
a165d533b6 Moved the rest of FMP to Init. 
Updated FZ Package Name.
Repairable = false;
 2014-02-04 21:17:35 -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
496a67abb9 Never rotate while sneaking! 
Fixed Crash.
 2014-02-01 20:26:30 -06:00
AlgorithmX2
a9efb2f17b Portable Cells can no store empty storage cells. 2014-02-01 16:25:56 -06:00
AlgorithmX2
764c0043d2 Network tools no longer stack. 2014-02-01 16:25:50 -06:00
AlgorithmX2
fbcee6ca12 Facade Creative Tab and Config. 2014-02-01 16:24:13 -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
97eaf35f6a Security Block Fully Functional. 2014-01-31 23:37:27 -06:00
AlgorithmX2
daa121b5d2 Fixed Storage Cells within Storage Cells. 2014-01-31 11:32:44 -06:00
AlgorithmX2
ecd7ea67b6 Localized P2P Types. 2014-01-31 11:32:30 -06:00
AlgorithmX2
7c9799320d IBiometricTool API Added. 2014-01-31 00:33:04 -06:00
AlgorithmX2
8653a4f79b Fixed Right Click Behavior of BiometricCard and Network tool when clicking on air. 2014-01-30 20:02:18 -06:00
AlgorithmX2
dc9a337560 Wrenches no longer rotate when sneaking. 2014-01-30 19:23:29 -06:00
AlgorithmX2
385103ffb7 Memory Cards Don't need Blocks. 2014-01-30 15:06:26 -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
1b6455421e Particle Settings 
Grinder Fix.
 2014-01-29 20:47:55 -06:00
AlgorithmX2
bdc48457ec Missing Files :( 2014-01-28 23:28:39 -06:00
AlgorithmX2
699e82a889 Fixed World Unload Crash. 
Fixed render crashes for items that are not available.
Parts now load properly.
 2014-01-28 16:30:14 -06:00
AlgorithmX2
1a95fb5b0e Tests parts before adding them. 
Proxied IC2 Events.
 2014-01-28 14:08:51 -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
0f75db5e80 Pretty much all of security minus the gui. 
and all the stuff I did that i forgot to comment.
 2014-01-26 22:00:36 -06:00
AlgorithmX2
6ecb969801 Fixed Priority Order, Added Read/Write and some refactoring. 2014-01-26 00:48:09 -06:00
AlgorithmX2
5a6cd05e20 Gui/Priority Tab/Storage work. 2014-01-26 00:44:50 -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
35a21d472f Parts/Materials both now have better registration, and both use DamageValues. 2014-01-03 12:30:08 -06:00
AlgorithmX2
587fb893b4 Materials now share an ItemID, seemed silly other wise. 2014-01-01 03:01:38 -06:00
algorithmx2
e9acdcbee2 AE2 First Commit, the dawn of 1.7 hast arrived. 2013-12-27 16:59:59 -06:00