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

209 commits

Author SHA1 Message Date
AlgorithmX2
883292a7b1 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-03 20:49:40 -05:00
AlgorithmX2
e6c80df3c8 Added support for parts too. 2014-06-03 13:00:10 -05:00
AlgorithmX2
fede238251 Formation Planes can now Place Heads. 2014-06-03 12:08:33 -05:00
AlgorithmX2
900a278ec2 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 
Conflicts:
	core/localization/GuiText.java
 2014-05-31 20:58:52 -05:00
AlgorithmX2
e8e97a1c20 Changed "Invalid NBT For CableBus Container" to a warning instead of a exception. 2014-05-27 16:02:15 -05:00
AlgorithmX2
45155caeee Annihilation Plane now drops its buffer. 2014-05-27 15:47:36 -05:00
AlgorithmX2
0ac83b04c9 Changed Package Names. 2014-05-27 12:15:49 -05:00
AlgorithmX2
ec58bdb879 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 2014-05-27 12:07:20 -05:00
AlgorithmX2
eb8e8da0a2 Removed Layers from API - I'm sick of people commenting on it. 2014-05-27 12:06:55 -05:00
AlgorithmX2
9b8596dc7c Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-26 10:59:03 -05:00
AlgorithmX2
3ac94550e5 Seeds can now be planted via Formation Planes. 2014-05-26 10:58:41 -05:00
AlgorithmX2
161f88e42c Added Paint Balls. 
Added Color Applicator.
 2014-05-26 03:26:37 -05:00
AlgorithmX2
425f144f25 And again! 2014-05-25 20:59:15 -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
bd7b154455 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-25 00:03:27 -05:00
AlgorithmX2
1b207a17e9 API Update. 2014-05-24 18:23:23 -05:00
AlgorithmX2
82a8e2d045 Fixed http://openeye.openmods.info/crashes/df3cca6850f2c037b6adb8d8d641b22f 
Improved Exception for http://openeye.openmods.info/crashes/d2df850ad1915a015a80f9f7cef56ac3
Improved Exception for http://openeye.openmods.info/crashes/c8a3f70288f017726c5acd09ea91a2b0
 2014-05-24 11:02:24 -05:00
AlgorithmX2
01bf88061d Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 
Conflicts:
	container/implementations/ContainerStorageBus.java
	core/sync/packets/PacketValueConfig.java
 2014-05-22 18:49:02 -05:00
AlgorithmX2
459239bfba Storage Buses no update their filters when their upgrades change. 2014-05-21 21:09:13 -05:00
AlgorithmX2
269bc40f0d Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-20 22:17:52 -05:00
AlgorithmX2
0b04d2853e Add backwards support for MJ5 ( from MJ6 ) 
Add another try catch facade test...
 2014-05-20 22:06:37 -05:00
AlgorithmX2
bd926374db Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-18 21:42:43 -05:00
AlgorithmX2
2cf84989d1 IC2 Double Buffer Approach. 2014-05-18 21:36:32 -05:00
AlgorithmX2
37d7675ad7 Darn it Power tunnels need power too! 2014-05-18 21:36:21 -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
c35faabfd8 Fixed Bug: #0436 - Fluid Tunnels don't require Power 
Fixed bug where fluid tunnels would not function properly.
 2014-05-18 14:44:58 -05:00
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