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

187 commits

Author SHA1 Message Date
AlgorithmX2
b872ae66c3 Fixed http://ae2.ae-mod.info/Tracker/0475/ 2014-05-29 11:41:29 -05:00
AlgorithmX2
7b33635c47 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-25 11:07:18 -05:00
AlgorithmX2
4cf6f4e5f9 Don't Show Energy Cell info if the NBT Came from the client. 2014-05-25 11:06:59 -05:00
AlgorithmX2
bd7b154455 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-25 00:03:27 -05:00
AlgorithmX2
baefedc4b8 ME Chest can have its drive removed via automation via the front slot. 2014-05-24 23:49:24 -05:00
AlgorithmX2
a861f09b01 ME Chest insertion behavior fixed. 
ME Chest drive slot now properly accessible from front drive face.
ME Chests can now function as tanks. ( fluid cells from extra cells )
ME Chests now return an empty slot list when they have no storage cells ( thus disconnecting from pipes. )
Fixed https://github.com/M3gaFr3ak/ExtraCells2/issues/18
 2014-05-24 18:25:22 -05:00
AlgorithmX2
a3264d03e2 Crafting CPUs now appear offline unless hey have their channel requirement met. 
Also their status shows in waila.
 2014-05-22 21:43:15 -05:00
AlgorithmX2
68993534d9 Slowly working towards crafting. 
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1

Conflicts:
	client/gui/widgets/GuiImgButton.java
	core/localization/ButtonToolTips.java
 2014-05-18 20:05:03 -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
14b7fe8a42 Add better custom security features. 2014-05-12 23:15:46 -05:00
AlgorithmX2
45c292344f Fixed Dormant Chunk Cache. 2014-05-12 21:15:45 -05:00
AlgorithmX2
be645f3e2f MJ 6 + MJ 5 Integration. 2014-05-11 16:13:37 -05:00
AlgorithmX2
ce561ffbe3 Merge in Builder support. 2014-05-11 13:48:14 -05:00
AlgorithmX2
34048d45a2 Don't erase inventory when someone asks for the drops... 2014-05-11 13:30:36 -05:00
AlgorithmX2
d84ec9c0bf Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-10 17:19:26 -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
3491fe4e33 Did what I could with mj6 2014-05-09 21:08:56 -05:00
AlgorithmX2
98fc460da0 Removed Old RF Api. 2014-05-09 09:42:52 -05:00
AlgorithmX2
f031972fcd Started working on crafting infrastructure and C-Cpus 2014-05-08 23:10:12 -05:00
AlgorithmX2
b0aedc1b01 MAC Now shows progress. 2014-05-08 23:09:42 -05:00
AlgorithmX2
6532af979d Molecular Assembler Single Pattern Mode "works" 2014-05-08 00:58:43 -05:00
AlgorithmX2
b4e8dada38 Crafting progress might be a thing. 2014-05-07 19:59:05 -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
5bf8e9d7d0 Updated RF Api ( should work for old api too - at least temporary ). 2014-05-06 18:09:31 -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
9c5c92401b Lower Cable TESR Distance to 30.0f 2014-05-04 17:53:32 -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
c904033567 Fix for FMP facade conflict. 2014-04-29 01:44:13 -05:00
AlgorithmX2
f21bf3e9bc Added Basic Restrictions on slots in MAC. 2014-04-24 20:55:29 -05:00
AlgorithmX2
e95da25144 Started Work in MAC Gui. 2014-04-24 01:14:26 -05:00
AlgorithmX2
a5c2c7244d Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-04-22 22:03:09 -05:00
AlgorithmX2
021e924098 Fixed issue with error prone Grid Visitors. 
Increased Channel update speed.
Renamed Controller Method.
 2014-04-22 21:49:03 -05:00
AlgorithmX2
323342314c Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-04-17 22:39:59 -05:00
AlgorithmX2
a4eb01b191 Allow security hand shakes for monitorables. 2014-04-17 22:33:48 -05:00
AlgorithmX2
2de3ab4505 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-04-10 22:02:23 -05:00
AlgorithmX2
79bbdd0bd1 host now responsible for cleanup, fixes onWrench MultiPart deletion. 2014-04-10 15:01:04 -05:00
AlgorithmX2
01c76a6870 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-04-09 20:12:49 -05:00
AlgorithmX2
b33d0771d6 Should fix CME. 2014-04-09 19:52:13 -05:00
AlgorithmX2
85b3a5ef32 Started Work on Pattern Terminal. 2014-04-07 19:43:57 -05:00
AlgorithmX2
2e103efab8 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 
Conflicts:
	tile/misc/TileCellWorkbench.java
 2014-04-06 18:20:20 -05:00
AlgorithmX2
1ae63261ed Workbench now drops the cell inside it if broken. 2014-04-06 18:14:28 -05:00
AlgorithmX2
13b3555d01 Added Copy Mode to the Cell Workbench. 2014-04-06 18:05:09 -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
794177b8d2 Fixed Bug: #0260 - Hotbar Keys + Inscriber 2014-03-29 18:36:37 -05:00
AlgorithmX2
ee11d9aa45 Added Waila details for WAP. 2014-03-27 23:31:37 -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
e91a3a9cc1 API Sync. 2014-03-25 12:13:34 -05:00
AlgorithmX2
b96eb3ce33 Added Immibis Microblock Support. 2014-03-22 16:51:37 -05:00
AlgorithmX2
2751a1467f Fixed Bug: #0212 - Vibration Chamber eat lava bucket 2014-03-21 20:25:12 -05:00
AlgorithmX2
c4a7d5b480 Added Rotatable Interfaces. 2014-03-19 22:28:53 -05:00
AlgorithmX2
919b90ea41 Fixed #0200 - Storage Bus Doesn't Connect to BC Pipe 2014-03-17 22:58:03 -05:00
AlgorithmX2
c2bcfeeb25 Adjustable Tick Rates. 2014-03-17 14:59:50 -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
754d2c25d9 Sided Inventories now properly observe their own rotation. 2014-03-13 21:59:37 -05:00
AlgorithmX2
67be86a19a Inscriber Recipe Handler, + Fixed Potential ME Chest Crash. 2014-03-13 13:26:55 -05:00
AlgorithmX2
a58d44e0cf Meanless Line Removed. 2014-03-12 22:43:39 -05:00
AlgorithmX2
a60d5a4cc7 Inscriber is fully functional, just needs textures. 2014-03-12 22:14:55 -05:00
AlgorithmX2
0ed0af3d34 Inscriber Functional, No render. 2014-03-11 22:26:50 -05:00
AlgorithmX2
ca46b3e2d9 Fixed Infinite Power Bug with Energy Acceptor. 2014-03-11 20:54:04 -05:00
AlgorithmX2
08df0f8b06 More work on inscriber, still not done yet. 2014-03-11 01:52:48 -05:00
AlgorithmX2
d5748eb804 Cables now work in Recipes. 
Added Ingredient Resolver Sets.
Shrunk MC Chest Battery.
 2014-03-09 21:11:29 -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
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
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
587803d3fa Less breaking Shit, More Render Fixes. 2014-03-04 21:56:20 -06:00
AlgorithmX2
d06c5d186b Fixed Render Issue with Chests in Meteorites. 
Meteorite Chests now contain items.
 2014-03-04 21:29:03 -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
d32137a336 Added Sky Rock. 
Added Sky Chest.
 2014-02-28 02:12:00 -06:00
AlgorithmX2
ef729e7365 Fixed casing of partChanged, and directionTo 2014-02-26 09:17:39 -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
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
302a41ac76 Added Crystal Growth Accelerator. 
Fixed Missing Textures.
 2014-02-22 16:14:43 -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
bea8f2cc07 Recipe API Update. 2014-02-19 17:33:36 -06:00
AlgorithmX2
87a4e5678f Fixed Bug: #0162 - Cant open ME Chest Inventory GUI 2014-02-18 11:43:38 -06:00
AlgorithmX2
646dafcc99 Moved Sorting Config Into the World. 2014-02-16 18:50:25 -06:00
AlgorithmX2
dc095749b7 Fixed Issue with DSU API, 
Re-added support for MJ
Re-added support for pipe
Re-added support for BC-Facades.
 2014-02-16 12:41:45 -06:00
AlgorithmX2
118f13edff Fixed typos, added proper argument-javadoc - Api Sync. 2014-02-12 10:35:42 -06:00
AlgorithmX2
d8dfe3798e Re-did grinder input code. 2014-02-11 20:02:21 -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
b57804be06 Removed Localization Stuff. 
Added Logging Option.
Logging of Exceptions is now done via AELogger
 2014-02-07 14:37:22 -06:00
AlgorithmX2
3343329ff9 Minor Improvement to Chest? 2014-02-05 23:31:19 -06:00
AlgorithmX2
f295669e6e TESR should use less CPU when no-op. 
onInventoryChange for FZ.
Networks without batteries can store up to 1000 AE.
Fixed a bug that cause energy to spiral out of control and go infinite.
Fixed a crash with storage buses and fluids.
 2014-02-05 22:36:10 -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
26202745ad Fix all Channel Behavior and its mis-behaving. 2014-02-02 20:30:52 -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
97eaf35f6a Security Block Fully Functional. 2014-01-31 23:37:27 -06:00