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

142 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
734663f521 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-11 00:44:00 -05:00
AlgorithmX2
bbfa43dd92 Breaking and Damaging Particles for cables now work properly. 
Breaking Animation now works on Cables as expected.
Cable now has a bounding box where it touches parts.
 2014-06-11 00:14:37 -05:00
AlgorithmX2
87bd8f3c22 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-07 23:29:57 -05:00
AlgorithmX2
009417ca4f Adjusted Block Hardness. 
Test Tools with getHarvestLevel
 2014-06-07 20:20:23 -05:00
AlgorithmX2
14aba981b2 Tweaked Energy Flow Code for Network Acceptor, should be more what I'm looking for. 2014-06-07 19:23:31 -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
8183becfd4 Paint Balls. 2014-05-31 20:50:56 -05:00
AlgorithmX2
623e3aa228 Revert "Cable Null checks for EVERYTHING!" 
This reverts commit 57d4541418.

This was already resolved - this is a duplicate fix.
 2014-05-29 15:01:42 -05:00
AlgorithmX2
57d4541418 Cable Null checks for EVERYTHING! 2014-05-29 11:40:42 -05:00
AlgorithmX2
905832ae85 Renamed ExtraTextures and added ExtraItemTextures. 2014-05-25 20:58:44 -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
bd7b154455 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-25 00:03:27 -05:00
AlgorithmX2
8f474b8baf Fixed http://openeye.openmods.info/crashes/e9ee0132c58b39e5d6b41983e239b77f 
Fixed http://openeye.openmods.info/crashes/90d72b392a1e968ef7dab98f5a65d1d8
 2014-05-24 23:55:13 -05:00
AlgorithmX2
5f21711204 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-24 10:40:16 -05:00
AlgorithmX2
6e1a0aabb6 Server doesn't have noTesr Tiles. 2014-05-24 10:29:45 -05:00
AlgorithmX2
5f5fc4cee1 Fixed Crafting MB Names. 2014-05-22 21:39:21 -05:00
AlgorithmX2
b15d3af12b Crafting CPU basics. 2014-05-17 22:19:23 -05:00
AlgorithmX2
cfeebae5ac First pass at trying to make a CPU render - is basically a multiblock heat vent at this point. 2014-05-15 09:34:38 -05:00
AlgorithmX2
6a8fafa58d Working Towards Crafing CPU MultiBlock 2014-05-13 21:42:14 -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
32f7e58cf0 Update API for metadata flag. 2014-05-11 11:24:46 -05:00
AlgorithmX2
03f938516a Ore no longer rotates. 2014-05-11 11:22:10 -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
3080510317 Major Update for Cable Rendering. 
TESRs will are no longer used if the tile contains no dynamic renders.
Added alpha pass rendering for stained glass.
Enabled Stained Glass facades.
Cables / Facades have less geometry by hiding faces on connected boxes.
Added AlphaPass Option to disable AlphaPass Cables rendering ( fixes crash with Immbis Microblocks. )
 2014-05-04 19:51:05 -05:00
AlgorithmX2
e95da25144 Started Work in MAC Gui. 2014-04-24 01:14:26 -05:00
AlgorithmX2
01c76a6870 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-04-09 20:12:49 -05:00
AlgorithmX2
6b244b341b Don't discriminate against blocks with custom rotation. 2014-04-09 20:02:34 -05:00
AlgorithmX2
85b3a5ef32 Started Work on Pattern Terminal. 2014-04-07 19:43:57 -05:00
AlgorithmX2
efa931a7a1 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-04-05 15:30:09 -05:00
AlgorithmX2
27f374eb04 Added Rotatable Blocks integration. 2014-04-03 23:12:35 -05:00
AlgorithmX2
c40c81070c All Terminals now can be opened in low power / channel state and show dark slots. 2014-03-27 23:31:06 -05:00
AlgorithmX2
a5379c82f8 Fixed Bug: #0246 - Typo 2014-03-27 19:33:35 -05:00
AlgorithmX2
e384761e82 No more wrenching chests. 2014-03-27 19:33:14 -05:00
AlgorithmX2
42963e6632 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 2014-03-26 22:58:10 -05:00
AlgorithmX2
f571e41198 Fix Z-FIghting. 
Fix Bounding Box.
 2014-03-26 22:57:38 -05:00
AlgorithmX2
37b18d77f4 Fix Block Cable Painting Support. 2014-03-26 22:27:14 -05:00
AlgorithmX2
249725a345 SkyStone Block Chest Drops Correct Version now. 2014-03-26 11:09:36 -05:00
AlgorithmX2
f636dad621 Make only SkyStone Softer 2014-03-26 01:15:13 -05:00
AlgorithmX2
2c4add0fdf Crafting Begin. 2014-03-25 22:06:54 -05:00
AlgorithmX2
bf1768b5ad Fixed Bug: #0222 - Wither can break the outside of the spatial storage dimension 2014-03-22 17:00:03 -05:00
AlgorithmX2
b96eb3ce33 Added Immibis Microblock Support. 2014-03-22 16:51:37 -05:00
AlgorithmX2
b86fb56999 Fixed invalid Orientation. 
Improved Logging for render mismatch.
 2014-03-22 13:27:44 -05:00
AlgorithmX2
c4a7d5b480 Added Rotatable Interfaces. 2014-03-19 22:28:53 -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
49fcc7f510 Renamed Inscriber Recipe Type to Inscribe. 
Missing Icon now supports Items.
Fixed Missing Icons for debug Items.
SkyStone Chests can now be disabled.
More work on Website Recipes.
Removed Unused method in Network Handler.
 2014-03-08 21:35:53 -06:00
AlgorithmX2
cd51b00b31 Basic Block/Gui/Tile registertion work for Inscriber is done. 2014-03-07 00:15:54 -06:00
AlgorithmX2
f918147b46 Fixed Spatial Pylon Initialization Bug. 2014-03-07 00:15:25 -06:00
AlgorithmX2
a464686393 No more snow in spatial cells. 
Fixed 2 network connection bugs when QNB's re-connect/worlds unload.
Matrix Frame can no longer be removed or even hovered over, even in creative.
Spatial Pylons Can now be seen on the Network Tool Gui.
 2014-03-06 22:30:59 -06:00
AlgorithmX2
aac12dd1fd Fixed QNB Derp. 
Fixed QNB's Bounding Boxes.
 2014-03-06 21:24:01 -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
d5182da346 IInventory Comparator Support. 2014-03-04 22:31:50 -06:00
AlgorithmX2
500558982f SkyStone Mining finalized. 
Added Ice meteorite spawn.
Fixed Crash with Meteorite Spawning.
 2014-03-03 22:56:08 -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
27b30588a6 Add Sky stone, Block, Brick, Small Brick, and Sky Stone Block Chest. 
Add All Sky Stone Crafting Recipes.
 2014-02-28 21:45:30 -06:00
AlgorithmX2
768470512b Sky Stone Smooth :3 2014-02-28 13:13:43 -06:00
AlgorithmX2
f1da7b1970 Stone Not Rock. 2014-02-28 09:27:04 -06:00
AlgorithmX2
d32137a336 Added Sky Rock. 
Added Sky Chest.
 2014-02-28 02:12:00 -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
5e0bf9c5b9 Fix Crash When using Debug Blocks. 
Register Quartz/Fluix Blocks with BC Facades.
 2014-02-23 14:06:07 -06:00
AlgorithmX2
e94b0bbe60 Re-Enabled IC2 API. 
Relocated Entity Package.
Removed Blank Patterns Item.
 2014-02-22 19:28:52 -06:00
AlgorithmX2
302a41ac76 Added Crystal Growth Accelerator. 
Fixed Missing Textures.
 2014-02-22 16:14:43 -06:00
AlgorithmX2
1de6520fae Tiny TNT now properly Ignites. 2014-02-15 22:40:17 -06:00
AlgorithmX2
3e8aeb4bc9 Fixed Missing Ignite Sound. 2014-02-09 12:34:27 -06:00
AlgorithmX2
36c3834284 You can now access the contents of the ME Chest if it has energy in its battery. 2014-02-09 01:56:24 -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
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
93ac258ee7 Security Term now displays a message when there is no power. 
Removed "No Message" Sorting.
You can no longer insert a biometric card for the Admin.
 2014-02-02 13:00:57 -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
8460cffd6c Allow Visual/Non Visual Boxes to differ for Custom Collsion / Buses. 2014-01-31 11:11:50 -06:00
AlgorithmX2
cedff21e7a Memory Card Removed Block ( some more ) 2014-01-30 18:48:30 -06:00
AlgorithmX2
1b6455421e Particle Settings 
Grinder Fix.
 2014-01-29 20:47:55 -06:00
AlgorithmX2
da5f8c4ad4 Fixed Incompatibility with FMP. 2014-01-28 21:10:23 -06:00
AlgorithmX2
373f062deb Insulated Server from Client Entities. 2014-01-28 13:27:22 -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
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
57a91c2969 Redstone Logic for Level Emitters 2014-01-06 00:54:51 -06:00
AlgorithmX2
53c5285ea0 Started Working on CellWorkbench 2014-01-06 00:54:25 -06:00
AlgorithmX2
14f8f72b88 stop dropping fake items! 2014-01-01 00:30:52 -06:00
AlgorithmX2
14207bb8e7 Open Guis Drive+Interface. 2013-12-28 15:09:58 -06:00
AlgorithmX2
2878030744 Ladders. 2013-12-28 14:54:05 -06:00
algorithmx2
e9acdcbee2 AE2 First Commit, the dawn of 1.7 hast arrived. 2013-12-27 16:59:59 -06:00