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

2989 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
yueh c1197c0084
Updated to latest Forge RB. (#3250) 
While this is not ideal for a stable release, switching to the latest RB
of Forge avoids the broken recipes in previous versions.
 2017-11-26 15:46:38 +01:00
fscan f0d807f0a2 Rework ContainerInscriber validation (#3238) 
* Correctly handle metadata wildcard for inscriber inputs
 2017-11-26 15:46:02 +01:00
fscan 5fa2c0ab27 Deprecate AE2 recipe system. (#3247) 
* Deprecate aerecipes to indicate that they are going away soon.
 2017-11-26 15:45:34 +01:00
fscan 3063bd887c Revert DamageableRecipe changes (#3246) 
Forge fixed this after all. This is no longer needed.
 2017-11-26 15:44:56 +01:00
Florian Scandella fac4a8f9dc Fix typo 2017-11-26 14:38:09 +01:00
fscan 9d8226da19
Remove swingArm in IToolHammer implementation. (#3249) 
Fixes #3248
 2017-11-25 13:38:22 +01:00
yueh 33754d289d
Fixes #932: Fire ExplosionEvent.Detonate when tiny TNT explodes. (#3229) 
This still bypasses the start event to prevent it from ever being
cancelled.
 2017-11-23 11:06:46 +01:00
fscan 959672dae3
Add CraftTweaker support (#3231) 2017-11-22 21:09:26 +01:00
fscan 90c17c09a8
Add custom recipe for damageable Ingredients (#3230) 2017-11-17 16:20:53 +01:00
yueh e0bf7223e0
Refactors grid connections (#3219) 
Extracted all checks and subsequent updates to a factory method from the constructor.
Reordered checks to check for nulls before anything else.
Also existing connections before security breaks.
Fixes TileController#checkController() using the wrong position.
Added debug logging for failed connections.
Improved logging.
Inversed boolean so false no longer means security check passed.
Only issue a security break on SecurityConnectionException.
 2017-11-12 18:13:59 +01:00
fscan ba9af94228 Fix StorageBus not updating item count correctly (#3218) 
* Queue tick instead of ticking immediatley
 2017-11-12 18:12:56 +01:00
yueh 122b6163dc
Fixes #3209: Reset stack to prevent leaking meaningful ones (#3210) 2017-11-12 12:53:40 +01:00
yueh fab42ccc75
Use craftinggrid to check existing patterns for JEI recipe transfer. (#3202) 2017-11-12 12:48:18 +01:00
yueh f5dd2c8b0a
Fixes tooltips for ME Slots (#3205) 
No longer strips colors from names, lore, etc.
Now uses the translation again for "Items Stored:" instead of a hardcoded string.
Removed obsolete methods.
 2017-11-12 12:35:05 +01:00
fscan a126112a2d
Rework ImportBus (#3206) 
Fixes #3201
 2017-11-11 19:59:11 +01:00
fscan 99cda5f5a3
Cleanup recipe factories (#3207) 
Fixes #3200
 2017-11-11 17:51:20 +01:00
Florian Scandella 56a5363528 Fix NetworkToolViewer stack overflow, saveguard against markDirty recursion. 
fixes #3199
 2017-11-08 13:17:34 +01:00
fscan be65edbd5b
Set base biome to "void" to shut up warning. (#3194) 
Fixes #3118
 2017-11-05 03:12:20 +01:00
fscan fe5d9251eb
Spatial IO fixes (#3195) 
* fix warning when transfering entities
* clean removed TileEntities from the ITickable list.
 2017-11-04 23:12:17 +01:00
yueh 3cf48b2291
Remove channels per side from non smart cable states. (#3192) 
These are unnecessary for these cable types and their rendering, but are
actually causing the cache to add duplicate models.
 2017-11-04 13:24:57 +01:00
yueh cc4599b5fc
Add a basic cache for cable models to avoid constant regeneration. (#3185) 
* Add a basic cache for cable models to avoid constant regeneration.
* Improved equals/hashCode to ignore cable unrelated parts or facades.
 2017-10-31 21:02:03 +01:00
yueh c1fa77df51
Fixes #3189: Formation plane unable to place special items. (#3190) 2017-10-31 16:12:08 +01:00
yueh 725fa491e6
Fixes #2611: Limit the adaptor to the main player inv. (#3188) 
This prevents the result from various inventory actions to be placed into
the offhand or armor slots.
 2017-10-31 14:05:05 +01:00
fscan e2a6cd1d57
Fix SkyChest bounding box (#3187) 
fixes #3149
 2017-10-31 01:40:17 +01:00
fscan 6ddf60fab8
Improve Facade rendering (#3182) 
UV fix based on #2941 by @MoreThanHidden
fixes #2679, fixes #2625
 2017-10-29 16:47:26 +01:00
fscan 2c07acfe81 Allow extraction for Condenser (#3179) 
fixes #2960, fixes #2017, fixes #2602
 2017-10-27 15:49:40 +02:00
fscan 3749742231 Fix handling of ItemStacks using getShareTag or Capabilites (#3171) 
Temporary fix, ideally we would have a way to reference the original ItemStack so we don't need to send the full NBT data to the client.
 2017-10-26 17:59:55 +02:00
yueh 74b9610b45 JSON resource cleanup (#3178) 
Unified formatting
Added missing new lines at end of file
Removed superfluous spaces
Removed channel texture from dense covered cables.
 2017-10-26 12:47:08 +02:00
yueh a725779ff6 Fixes #3175: Return the correct used amount. (#3176) 2017-10-26 12:46:49 +02:00
Flithor b82df25c75 Update zh_cn.lang (#3137) 2017-10-21 00:47:07 +02:00
fscan cc9b33b473 Implement Advancements (#3160) 
Improvements welcome.
 2017-10-20 23:54:18 +02:00
fscan 5496b746ea Fix Tiny TNT (#3162) 2017-10-20 23:52:55 +02:00
fscan f80f623ccf Fix AESharedItemStack#compareNBT to get consistent ordering. (#3169) 2017-10-20 23:25:18 +02:00
yueh cba6c5500f Fixes inscriber crash with name presses. 2017-10-16 21:41:44 +02:00
Florian Scandella bc8268af94 readd the non-fortune version 2017-10-15 16:07:12 +02:00
Florian Scandella 297cd16702 cleanup BlockQuartzOre and circumvent Forge bug 2017-10-15 15:53:31 +02:00
Florian Scandella 41711e50b9 Check for null in UpgradeInventory#saveChanges. Fixes #3159 2017-10-14 23:53:34 +02:00
Florian Scandella 2bfb8b75e8 Return correct item defintion. 2017-10-14 19:06:57 +02:00
yueh 58e96aa3de Fixes new modes not being considered JEI modes. 2017-10-14 14:39:05 +02:00
fscan 4f07b63b13 API cleanups (#3155) 
* Remove obsolete api and fix some warning
* Move MEMonitorHandler to internal code and fix some warnings
* Rename exceptions to conform to naming scheme
 2017-10-14 14:15:28 +02:00
yueh 905dd6c888 Added a clientside config to keep or clear the search filter when opening. (#3154) 
Closes #3153.
 2017-10-14 14:13:18 +02:00
yueh ab7f35a9ee Further StorageChannel refactoring (#3152) 
Updated Drives to support more than Item and Fluid cells.
Use Collections.emptyList() instead of creating empty ArrayLists.
Fixes a NPE with uninitialized ME Chests.

Fixes #3150
 2017-10-14 14:12:24 +02:00
yueh 6e81f698c0 Refactored StorageChannel enum into an interface (#3138) 
This replaces the static enum with a more dynamic interface providing
factory methods for handling network storage.
 2017-10-08 17:59:30 +02:00
fscan 8ad8ce68b5 Added optional TE wrench support. (#3145) 2017-10-08 17:58:57 +02:00
yueh 644194d0d6 Updated Forge to 1.12.2 RB (#3141) 
* Updated Forge to 1.12.2 RB

Updated mappings to the MDK defaults for 1.12.2
Updated related depdencies

* With Forge 14.23 not available for < 1.12.2, we have to drop support.

With one potential fix for TE corruption, this step should be
reasonable.
 2017-10-08 17:34:05 +02:00
yueh 95b27f490c Added Registry for customized charger rates. (#3139) 
* Added Registry for customized charger rates.
* Added rates for all chargable items/block.
* Charger and Inscriber now store 1.6k AE each instead of 1.5k
* A crank applies 160 AE instead of 150
* Charged certus now requires 1.6k instead of 1.5k
 2017-10-08 17:33:06 +02:00
fscan 6032c0328e Fixes #3143: Queue network list updates in onTick (#3144) 2017-10-08 15:12:27 +02:00
fscan e8d554d69d Fix Inscriber recipe registration (#3131) 
Fixes #3129
 2017-10-02 22:03:22 +02:00
fscan 1e15b23506 Rework AEItemStack (#3091) 
* Use itemstack as itemdef
* HIGH_TAG/LOW_TAG should be compared both directions
* Remove getTagCompound
* Make Itemlist implementation independent
* Cache item id for performance reasons
* Add preconditions to saveguard against external meddling
* Chache itemDamage
* Remove IAEStackSearchKey for now, rename getDisplayStack
 2017-09-30 17:18:30 +02:00
yueh 2ed7a5598a Improved IGrinderRegistry (#3110) 
* Improved IGrinderRegistry

Added a builder for grinder recipes similar to IInscriberRegistry.
Replaced different add methods with this builder.
IIinscriberRegistry#addRecipe and removeRecipe now return true on success.
 2017-09-29 20:32:59 +02:00