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 |
|
AlgorithmX2
|
14b7fe8a42
|
Add better custom security features.
|
2014-05-12 23:15:46 -05:00 |
|
AlgorithmX2
|
9f0e31b303
|
prevent crash with derpy facades.
|
2014-05-11 17:01:48 -05:00 |
|
AlgorithmX2
|
bd5e80fba1
|
Facades should use names, not ids.
|
2014-05-11 11:41:31 -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
|
93aad6c53b
|
Fixed Crash with Extra Utilities.
Items in the ore dictionary values no longer fail to migrate.
Fixed "Meta Overlap detected" error.
Recipes now work with new Materials/Parts.
|
2014-05-06 12:08:48 -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
|
4d5a6ce301
|
Add Stained Glass facades.
The Item Bus Renderer can now deal with Alpha Pass.
|
2014-05-04 15:46:38 -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
|
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
|
8a9136cbb3
|
Attempt Number two are making config generation consistent.
|
2014-04-28 15:00:53 -05:00 |
|
AlgorithmX2
|
c72ce5ba06
|
Prevent Materials from crashing if they are disabled.
|
2014-04-27 23:50:26 -05:00 |
|
AlgorithmX2
|
f21bf3e9bc
|
Added Basic Restrictions on slots in MAC.
|
2014-04-24 20:55:29 -05:00 |
|
AlgorithmX2
|
589e2d60d2
|
Pattern slots now report the output qty as well as the item type, at all times ( not just when shift is held )
|
2014-04-23 00:30:29 -05:00 |
|
AlgorithmX2
|
85f15e7c06
|
Pattern Renderer ( for shift )
|
2014-04-22 20:36:26 -05:00 |
|
AlgorithmX2
|
67d46d57d2
|
Patterns can now be encoded.
Added a clear button to the Pattern Terminal.
Added description to the Encoded Pattern Item.
|
2014-04-17 01:15:56 -05:00 |
|
AlgorithmX2
|
7dc251611c
|
tiny progress...
|
2014-04-08 21:56:59 -05:00 |
|
AlgorithmX2
|
ee42c53f89
|
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
|
2014-04-06 14:12:52 -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
|
97c06db6ef
|
Use ordinal of parts/items as the default meta, allows for holes in the setup but lets default configs be consistent regardless of other mods.
|
2014-04-06 01:51:44 -05:00 |
|
AlgorithmX2
|
efa931a7a1
|
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
|
2014-04-05 15:30:09 -05:00 |
|