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

281 commits

Author SHA1 Message Date
AlgorithmX2
8838fc4ba6 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-15 21:43:11 -05:00
AlgorithmX2
6f96ae6074 Removed Alpha Migration. 
Fixed a crash when AE is rendering as a FMP Part.
Meteorite Loot is now less random.
Added support for CLApi ( might be neat as it develops )
 2014-05-15 21:18:30 -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
9ba6f195fd Removed Logging from BC Tunnel. 2014-05-12 21:20:22 -05:00
AlgorithmX2
f4e685a0e8 Fix Crashes for MJ5. 
Disable MJ6
 2014-05-11 17:01:31 -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
f7e638c172 changing facades now updates the world render. 2014-05-11 11:30:00 -05:00
AlgorithmX2
d84ec9c0bf Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-10 17:19:26 -05:00
AlgorithmX2
570f098f81 Fixed a few more rendering/visual update glitches. 2014-05-10 13:27:48 -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
1ba7feac9f Fixed minor render issue with glass cables connected to machines. 2014-05-09 20:29:24 -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
d0229a16de Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-08 01:02:10 -05:00
AlgorithmX2
c11e3ba588 TESR update packets should no longer cause block updates. 2014-05-08 01:00:29 -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
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
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
86c096c357 One Last fix for BC Facdes :( 2014-05-04 19:39:29 -05:00
AlgorithmX2
0ed7cd7bb4 BC Facades work again. 2014-05-04 14:54:07 -05:00
AlgorithmX2
e25014fd5b Storage Buses no longer error on load. 2014-05-03 23:15:26 -05:00
AlgorithmX2
5dbba26930 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-03 19:23:48 -05:00
AlgorithmX2
21e40a5fb3 Fix failure ghost contents when breaking an inventory on a storage bus. 2014-05-03 19:20:54 -05:00
AlgorithmX2
58763ef17f Removed Pointless value. 2014-05-03 19:20:20 -05:00
AlgorithmX2
bed34bf9b5 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-03 15:29:42 -05:00
AlgorithmX2
6ff118e2b7 Annihilation Plane and Formation Plane no update their renders properly. 2014-05-03 14:25:37 -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
cc8c3bb75e Implemented 5% Tunnel Tax. 2014-05-02 00:40:46 -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
6b87e36bb3 Bug: #0386 - Memory Card not detect flat ME Interface 
Interface parts can share Settings with bocks.
 2014-05-01 00:41:19 -05:00
AlgorithmX2
c904033567 Fix for FMP facade conflict. 2014-04-29 01:44:13 -05:00
AlgorithmX2
f6a132e19e Null Check. 2014-04-28 13:19:41 -05:00
AlgorithmX2
62166f1e94 Fix Bug: #0373 - Interface dont Drop Items (Items Lost) 2014-04-27 23:50:50 -05:00
AlgorithmX2
a29afb9dd9 Fiber don't use power. 2014-04-26 21:53:30 -05:00
AlgorithmX2
eadd67a34c Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-04-24 02:14:58 -05:00
AlgorithmX2
722d065c2c Storage monitors now use display lists. 2014-04-24 02:14:18 -05:00
AlgorithmX2
fafa79e657 Monitors now use render caching. 2014-04-24 02:14:07 -05:00
AlgorithmX2
a5c2c7244d Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-04-22 22:03:09 -05:00
AlgorithmX2
49c7f9a93b Cache Tanks, might be a minor performance benefit. 2014-04-21 16:11:39 -05:00
AlgorithmX2
e9759f681e Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-04-20 13:53:43 -05:00
AlgorithmX2
fa307b467e Facades and FMP parts can no longer overlap. 2014-04-19 23:35:48 -05:00
AlgorithmX2
18e96644d6 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-04-17 22:52:47 -05:00
AlgorithmX2
3d06bb3ba5 Fixed bug with Import Bus with 4 accelerators only pulling 64 items. ( should be 96 ) 2014-04-17 22:52:21 -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
572352c18e Networks now run at 1x speed. 
Illuminated Panels now use proper channel and power settings.
 2014-04-17 19:44:51 -05:00
AlgorithmX2
f14581edae Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-04-16 23:39:03 -05:00
AlgorithmX2
9f7e809662 Terminals show now drop View Cells. 2014-04-16 11:59:37 -05:00
AlgorithmX2
506b7a7129 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-04-14 02:39:39 -05:00
AlgorithmX2
36dad44a6a Fixed Hit Boxes on Import Bus, Interface, Storage Bus, P2P Tunnels 2014-04-10 22:54:28 -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
f8d60e801a Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-04-10 00:59:15 -05:00
AlgorithmX2
661afe846c Fixed Bug with P2P Tunnels not disconnecting in certain cases. 2014-04-10 00:58:56 -05:00
AlgorithmX2
d84be03027 Large chunk on the pattern terminal. 2014-04-09 23:51:08 -05:00
AlgorithmX2
01c76a6870 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-04-09 20:12:49 -05:00
AlgorithmX2
ac0c562b02 Fixed Channel requirements for illuminated panels. 2014-04-09 14:22:36 -05:00
AlgorithmX2
db6a958a6f Fix Interface Crash caused by negative items. 2014-04-09 14:22:17 -05:00
AlgorithmX2
7dc251611c tiny progress... 2014-04-08 21:56:59 -05:00
AlgorithmX2
6203b172f6 Better Solution for extra energy injection. ( Fixes Crash ) 2014-04-07 21:31:36 -05:00
AlgorithmX2
0cec53eece More Pattern Terminal Stuff. 2014-04-07 21:25:41 -05:00
AlgorithmX2
2ebca04296 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-04-07 19:47:39 -05:00
AlgorithmX2
7a0674a75b Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 2014-04-07 19:46:27 -05:00
AlgorithmX2
0a9bb1eb2f Storage Bus now updates render when changing statuses. 2014-04-07 19:45:38 -05:00
AlgorithmX2
85b3a5ef32 Started Work on Pattern Terminal. 2014-04-07 19:43:57 -05:00
AlgorithmX2
9cd502ed56 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 2014-04-07 11:27:36 -05:00
AlgorithmX2
85ffe63ebe Toggle Buses Don't need Channels. 2014-04-07 11:27:00 -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
028555bc8a Fixed Fluid Render. 2014-04-05 21:50:01 -05:00
AlgorithmX2
59f3c703e2 Separated Textures for many parts. 2014-04-03 23:31:10 -05:00
AlgorithmX2
d3ac967eaa Fixed Bug: #0268 - MC Ladders, any way to prevent slow down? 2014-03-31 22:23:50 -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
37b18d77f4 Fix Block Cable Painting Support. 2014-03-26 22:27:14 -05:00
AlgorithmX2
4fde370d7f Fixed a bug with storage buses not re-announcing their cell array after powering on. 2014-03-19 20:51:41 -05:00
AlgorithmX2
856ed9fb1c Some Clean up. 2014-03-19 20:38:19 -05:00
AlgorithmX2
a475a3e91f Resolved #0202 - The question of cable power usage. 
Cables no longer use power.
Each channel on a block now consumes 1 / 128 AE/t
 2014-03-17 22:58:58 -05:00
AlgorithmX2
c2bcfeeb25 Adjustable Tick Rates. 2014-03-17 14:59:50 -05:00
AlgorithmX2
a05bdd82e9 Removed Logging. 2014-03-15 23:31:23 -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
929efa5597 Added 4 View Cell Slots. 
Multiple View Cells now sum together to allow more customization.
View Cells are now protected by Build Security.
Meteorite Compass now renders correctly in other peoples hands.
 2014-03-04 21:12:23 -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
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
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
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
eb15bd3a68 Added Energy Watcher API 
Added Event to Recalculate Channel Requirements for a Node.
Level Emitter can now output redstone based on network energy levels.
Level Emitter's entry field can now hold longs ( text box supports up o trillions )
 2014-02-21 00:10:38 -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
921c681b47 Buses now render properly in Item Frames. 
Fixed Issue with Storage Monitor Renders.
Fixed  a render glitch on formation/annihilation entity form.
 2014-02-19 22:20:38 -06:00
AlgorithmX2
39fed650aa Added Waila Integration. 2014-02-19 21:16:41 -06:00
AlgorithmX2
97ae2b78e3 Fixed Crash in Formation Plane. 
Fixed Bug: #0166 - Combination TPane and FPane seems getting stuck
 2014-02-18 23:26:43 -06:00
AlgorithmX2
da8677b70a Formation Plane Added. 2014-02-17 23:51:31 -06:00
AlgorithmX2
aa8696cc45 Fixed Non Mounted Level Emitter render. 2014-02-17 21:24:02 -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
644217baf5 Cache Lighting Data. 2014-02-15 00:30:06 -06:00
AlgorithmX2
8808ca63c3 Alerting a non Alertable tile no longer crashes. 
Planes can no longer pick up Item Entities without power.
 2014-02-14 00:25:49 -06:00
AlgorithmX2
7f99e281f0 Annihilation Plane no longer CME's on breaking network components. 
Annihilation Plane properly breaks things when power is restored.
 2014-02-14 00:15:04 -06:00
AlgorithmX2
480f4b8180 Cables now use simplified rendering. 2014-02-13 23:32:35 -06:00
AlgorithmX2
07b1bb8473 Added Annihilation Plane. 2014-02-13 22:27:15 -06:00
AlgorithmX2
3d09f6918f Storage Cache now announces changes for cell containers as they are added and removed. 2014-02-13 20:27:04 -06:00
AlgorithmX2
118f13edff Fixed typos, added proper argument-javadoc - Api Sync. 2014-02-12 10:35:42 -06:00
AlgorithmX2
97269c0ffa Facades No Longer Eat Cables. 2014-02-12 00:17:44 -06:00
AlgorithmX2
4ced9575a8 Removed Import/Export Tile Caching. 2014-02-11 22:43:31 -06:00
AlgorithmX2
61d79900db Adjusted ItemStack render for all cables. 2014-02-11 20:31:08 -06:00
AlgorithmX2
d14d1c6f07 Fixed render glitch with dense cable and buses. 2014-02-11 20:01:55 -06:00
AlgorithmX2
bfca3e04e0 Toggle Busses no longer use power. 2014-02-10 23:51:48 -06:00
AlgorithmX2
df1ba5282a Facades now drop with the removal of cable. 2014-02-09 19:03:19 -06:00
AlgorithmX2
a020e11849 Fixed Channels for Real. 2014-02-09 16:53:11 -06:00
AlgorithmX2
9dd497fde4 Channels Render again. 2014-02-09 15:38:45 -06:00
AlgorithmX2
9c1b45078b Fixed Covered/Smart Cable rendering bug. 2014-02-09 12:57:27 -06:00
AlgorithmX2
a758412006 Can now place storage monitors on Secure Networks. 2014-02-09 12:36:17 -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
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
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
e79e866417 Adjusted Terminal Packet Limits. 
Fixed random errors thrown when FMP is installed.
Finished Crafting Terminal Basic Features.
 2014-02-05 01:25:44 -06:00
AlgorithmX2
f8e6a426ce Tweaked Terminal Gui to use smaller textures. 
Crafting Terminal Added, ( incomplete )
Moved FMP Cut-able Registration to Init.
Upgrades now drop when parts break.
TE -> TE3 pulverizer api.
 2014-02-04 20:44:54 -06:00
AlgorithmX2
01684cf7c7 Fixed Covered Cable Rendering glitch. 2014-02-04 18:49:33 -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
9aa8d416aa Fixed BC Api Dependency with P2P 2014-02-02 12:29:38 -06:00
AlgorithmX2
2d61ca3fd0 Removed TE p2p wrapper. 2014-02-01 20:52:37 -06:00
AlgorithmX2
97eaf35f6a Security Block Fully Functional. 2014-01-31 23:37:27 -06:00
AlgorithmX2
a9629460bb Fixed Typo REQUIRE_CHANNEL. 2014-01-31 15:12:15 -06:00
AlgorithmX2
7319b4e6ae Fixed Crash with P2P Tunnels. 2014-01-31 11:39:09 -06:00
AlgorithmX2
8460cffd6c Allow Visual/Non Visual Boxes to differ for Custom Collsion / Buses. 2014-01-31 11:11:50 -06:00
AlgorithmX2
d937a4e4e3 Fixed Item Tunnel Update issue. 2014-01-30 21:06:54 -06:00
AlgorithmX2
87fa34042d Fixed Issue with Fluid Tunnels not updating each theres state. 2014-01-30 21:06:30 -06:00
AlgorithmX2
5c2cf0e1e3 Fixed A bug where tunnels are Updated before the network. 
Tunnel Attunement now causes a block update.
 2014-01-30 20:55:42 -06:00
AlgorithmX2
ac365b28c6 Tile Saving 2014-01-30 18:50:11 -06:00
AlgorithmX2
1929579df0 Thin Facades. 2014-01-30 18:49:27 -06:00
AlgorithmX2
ae6ba6a071 Tunnels Memory Card Fix, and Messages. 2014-01-30 15:07:03 -06:00
AlgorithmX2
6583ce8626 Dense/Cable can be defined more definitively by the Part Framework. 2014-01-30 12:54:09 -06:00
AlgorithmX2
4be835d27f Fixed Cable Rendering Glitch. 2014-01-29 21:17:59 -06:00
AlgorithmX2
da5f8c4ad4 Fixed Incompatibility with FMP. 2014-01-28 21:10:23 -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
2e8ffc4a09 Work on Storage Bus. 2014-01-24 10:35:58 -06:00
AlgorithmX2
594adc141c Fixed issue with Upgrades not having correct maximums. 2014-01-24 10:35:35 -06:00
AlgorithmX2
86e11d6e3f Colored Item Definitions 2014-01-24 10:30:57 -06:00