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

148 commits

Author SHA1 Message Date
AlgorithmX2
859ee9eaae Show only Export Bus on Crafting Card instead of Import/Exprot Bus. 2014-07-12 20:02:40 -05:00
AlgorithmX2
91051183ad Color Applicator now works on glass/stained glass. 2014-07-12 18:10:27 -05:00
AlgorithmX2
3ec4d8495e Fixed Bug: #0603 - Anvil Repair of Quartz Tools 2014-07-12 17:57:53 -05:00
AlgorithmX2
6177c854d0 Fixed Pattern De-Coding. 2014-07-12 14:27:06 -05:00
AlgorithmX2
43be28d6ad Black List Lumen Paint Balls on Applicator. 2014-07-11 21:12:00 -05:00
AlgorithmX2
2b8cd80f32 InvalidType missing texture round two! 2014-07-11 00:06:41 -05:00
AlgorithmX2
441018a6bb Fixe Missing texture Errors. 2014-07-11 00:01:31 -05:00
AlgorithmX2
0e676f5171 GameProfile API Sync. 2014-07-09 15:07:53 -05:00
AlgorithmX2
813c1bcb58 Considerable progress on Interface terminal. 2014-07-07 22:48:21 -05:00
AlgorithmX2
82b9e2c71f Fixed damage for seeds. 2014-07-01 20:51:36 -05:00
AlgorithmX2
ce9d84fc18 De-code patterns when you shift click. 2014-07-01 20:44:54 -05:00
AlgorithmX2
72ea6a5fa5 Sort Items alphabetically in creative tab. 2014-07-01 20:44:35 -05:00
AlgorithmX2
9a2614540d Implementing Crafting Upgrade. 2014-07-01 20:44:12 -05:00
AlgorithmX2
8705180bae Removed Lumen Cable. 2014-07-01 20:32:27 -05:00
AlgorithmX2
03ee61c1b5 Merge branch '1.7.10' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-29 12:44:30 -05:00
AlgorithmX2
a0bb77fa43 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into 1.7.10 2014-06-29 12:43:45 -05:00
AlgorithmX2
2c77242667 Disassemble Storages Cells regardless of where your looking. 2014-06-29 12:43:09 -05:00
AlgorithmX2
4c999e1f2b Fixed Minor Compile Error. 2014-06-29 12:30:38 -05:00
AlgorithmX2
96b5115538 IC2 Api Update. 2014-06-28 20:26:43 -05:00
AlgorithmX2
e5e373ce10 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-28 17:34:03 -05:00
AlgorithmX2
6718fae629 Initial 1.7.10 IC2 API Update. 2014-06-28 17:32:40 -05:00
AlgorithmX2
3031d60fc4 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-28 00:36:48 -05:00
AlgorithmX2
9191d8d29e Split RF into RF Tiles and RF Items, should fix some crashes. 2014-06-28 00:25:54 -05:00
AlgorithmX2
2a8c028ab9 minor cpu gui work. 2014-06-26 21:47:26 -05:00
AlgorithmX2
215c097506 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-25 23:02:22 -05:00
AlgorithmX2
c7692d1be6 Fixed Bug: #0562 - Inventory desync while dismantle storage cells 
Fixed a bug where disassembling storage cells might put items in the players armor slots.
 2014-06-25 21:57:49 -05:00
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
5dec6e7003 Cell Type Usage Fixed. 2014-06-12 09:37:08 -05:00
AlgorithmX2
734663f521 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-11 00:44:00 -05:00
AlgorithmX2
ef2e3bc7cb Seeds now make sense with item automation. 2014-06-11 00:21:03 -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
faad4a6ba2 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-04 00:07:57 -05:00
AlgorithmX2
f894d48328 Add resistance to MultiItems to prevent crashes from invalid stacks. 2014-06-04 00:07:36 -05:00
AlgorithmX2
95ebaa439e Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-03 08:50:41 -05:00
AlgorithmX2
a71d8047b4 Hide getManager(ItemStack itemStack) from non IC2 Code. 2014-06-03 08:39:46 -05:00
AlgorithmX2
a1af4443b7 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-02 19:32:51 -05:00
AlgorithmX2
6485026235 Matter Cannon Compiles with Changes. 
Disabled Paint Balls for now.. not sure I'm going to have the drive to finish that stuff.
 2014-06-02 19:32:38 -05:00
AlgorithmX2
a82a03f3b9 IC2 Charging Re-Implemented. 2014-06-02 11:23:47 -05:00
AlgorithmX2
384df1c18b Almost compiles again... 2014-06-02 00:37:13 -05:00
AlgorithmX2
8183becfd4 Paint Balls. 2014-05-31 20:50:56 -05:00
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