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

2158 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
thatsIch f138a68f3e Merge pull request #1071 from downslope7/grid-connection-exists-coords 
Add coords to duplicate connection GridException.
 2015-03-22 07:48:23 +01:00
downslope7 30191eb5ba Add coords to duplicate connection GridException. 
This exception isn't caught and crashes the server. Added block coordinates to aid in diagnostics.
 2015-03-21 20:05:08 -05:00
thatsIch 4552394f6e Removes deprecated method access of LocatableRegistry and getPickBlock 2015-03-21 16:03:26 +01:00
thatsIch 9c3d3db3fb Updated public dependencies 
- FMP
- CCL
- WAILA
- BC
 2015-03-21 11:51:11 +01:00
thatsIch 9c1c9056f1 Merge pull request #1063 from KamranMackey/rv2 
Fixed a couple typos in en_US.lang.
 2015-03-21 11:41:06 +01:00
Kamran Mackey b5582688a3 Fixed a couple typos in en_US.lang. 2015-03-21 03:57:41 -06:00
thatsIch 34597a4e21 Merge pull request #1046 from thatsIch/b-976-version-checker 
Fixes #976 Now uses GitHub to retrieve most current version
 2015-03-17 20:23:14 +01:00
thatsIch e0b32d2641 Merge pull request #1044 from TheVikingWarrior/patch-1 
Update it_IT.lang
 2015-03-17 07:22:06 +01:00
thatsIch 6baf952904 Fixes #976 Now uses GitHub to retrieve most current version 
Reworked whole Version Checker with an extensible interface to add any other service later on easier.
The version checker now has its own config file, to collect the different options and extract them from the main config file.
In that you can specify how fine the versions should be checked.
 2015-03-17 07:18:49 +01:00
TheVikingWarrior f132ae3678 Update it_IT.lang 2015-03-16 20:59:01 +01:00
yueh 720b38442e Merge pull request #1034 from yueh/feature-improve-meinventoryhandler-getaccess 
Improved MEInventoryHandler.getAccess()
 2015-03-16 11:29:57 +01:00
yueh 136f5d7314 Merge pull request #1037 from yueh/fix-1030 
Fixes #1030 IndexOutOfBoundsException caused by using wrong index
 2015-03-16 11:23:49 +01:00
yueh a83e4b7c3d Fixes #1030 IndexOutOfBoundsException caused by using wrong index 2015-03-15 19:55:58 +01:00
yueh 1bb0109c45 Improved MEInventoryHandler.getAccess() 
Changed the public fields to setters and getters
Added a cache for the evaluated values instead of calculating with each
access
 2015-03-15 19:43:12 +01:00
thatsIch 4744dfab78 Merge pull request #1029 from thatsIch/e-1024-zinc 
Fixes #1024 Added zinc to the grindstone, which is part of Flaxbeards Steam Power (FSP)
 2015-03-15 18:38:03 +01:00
thatsIch 7dedd4700f Fixes #1024 Added zinc to the grindstone, which is part of Flaxbeards Steam Power (FSP) 
Added zinc to the array of checked ore dictionary names, so if any mod decides to add Zinc in the future or uses it via the OreDictionary, it will be automatically added to the grindstone.

The commit also contains some scoping and code cleanup of the underlaying calls
 2015-03-15 09:02:23 +01:00
thatsIch 95fb894ba3 Merge pull request #1028 from bakaxyf/patch-1 
Update zh_CN.lang
 2015-03-15 08:22:05 +01:00
bakaxyf 621ddc5535 Update zh_CN.lang 2015-03-15 11:05:24 +08:00
yueh ece09a956b Merge pull request #1016 from yueh/fix-1015 
Fixes #1015 no longer eat a single item when not able to satisfy the recipe
 2015-03-13 23:49:12 +01:00
yueh db5493f60b Merge pull request #1012 from yueh/fix-1011 
Fixes #1011 skip null values
 2015-03-12 19:23:21 +01:00
yueh f0482dd391 Fixes #1015 no longer eat a single item when not able to satisfy the recipe 2015-03-12 19:07:59 +01:00
yueh c53b3b5dfc Fixes #1011 skip null values 2015-03-11 23:57:48 +01:00
thatsIch ad16550a86 Merge pull request #1009 from bakaxyf/patch-2 
Update zh_CN.lang
 2015-03-11 17:11:30 +01:00
bakaxyf 99e4928542 Update zh_CN.lang 2015-03-12 00:09:12 +08:00
yueh 43995a4b32 Merge pull request #987 from yueh/feature-improve-aeitemstack-compareto 
Improved AEItemStack.compareTo performance.
 2015-03-11 16:54:09 +01:00
thatsIch 8ec9bb8b3b Merge pull request #998 from thatsIch/e-920-extended-reach 
Fixes #920 Increased GUI close distance to Vanilla MC
 2015-03-11 16:40:32 +01:00
thatsIch 18c8197ff4 Merge pull request #996 from thatsIch/b-861-unlinked-wireless-spam 
Fixes #861 Wireless Terminal notifies player, if it is unlinked
 2015-03-11 16:40:21 +01:00
thatsIch dd1ca1e286 Fixes #861 Wireless Terminal notifies player, if it is unlinked 2015-03-11 09:00:40 +01:00
thatsIch c9f0b4e489 Fixes #920 Increased GUI close distance to Vanilla MC 2015-03-11 07:00:45 +01:00
thatsIch 63a6037ad2 Merge pull request #992 from thatsIch/e-319-new-bc 
Fixes #743 crash with plugs, fixes #942 builder integration, closes #319 BC 6 prep
 2015-03-11 00:49:21 +01:00
thatsIch 3675f154d1 Merge pull request #993 from Mazdallier/patch-1 
Update fr_FR.lang
 2015-03-09 15:05:21 +01:00
Yves 5e5be0e192 Update fr_FR.lang 2015-03-09 13:46:12 +01:00
thatsIch e300bf93fd Fixes #743 crash with plugs, fixes #942 builder integration, closes #319 BC 6 prep 2015-03-09 13:10:43 +01:00
yueh cdf949a557 Merge pull request #991 from thatsIch/b-972-level-emitter-tooltip 
Fixes #972 Tooltip now corresponds to the actual behaviour
 2015-03-09 13:00:03 +01:00
yueh 4c5aeac39f Merge pull request #952 from yueh/update-dependency-versions 
Updated Forge and other dependencies
 2015-03-09 12:59:52 +01:00
yueh a5f58bb22f Merge pull request #829 from yueh/fix-improve-orehelper-performance 
Improved OreHelper performance
 2015-03-09 12:59:38 +01:00
thatsIch dddfd6dbaf Fixes #972 Tooltip now corresponds to the actual behaviour 2015-03-09 10:07:13 +01:00
yueh 53f448e578 Improved AEItemStack.compareTo performance. 2015-03-08 15:27:27 +01:00
yueh 311939c63c Merge pull request #973 from yueh/feature-improve-security-audit-log 
Some further improvements to the security audit
 2015-03-07 16:37:59 +01:00
yueh d8a3556bc3 Merge pull request #983 from yueh/fix-982 
Removes creating a ItemStack with a full NBT copy
 2015-03-07 16:35:56 +01:00
yueh 57e84c3039 Removes creating a ItemStack with a full NBT copy 
There is no need to create a full copy just to fetch the already available
stacksize. It still respects the maximum stacksize of Integer.MAX_VALUE as they copy is doing.

Fixes #982
 2015-03-07 15:45:59 +01:00
yueh 1bcf7f9d52 Some further improvements to the security audit 2015-03-05 14:53:10 +01:00
yueh 2746002eb1 Merge pull request #949 from yueh/feature-optional-colored-crafting-status 
Added an option to disable the colored crafting status
 2015-02-28 18:50:11 +01:00
yueh ee6a3def22 Merge pull request #956 from yueh/feature-improve-security-audit-log 
Added some more information to the security audit
 2015-02-28 18:49:53 +01:00
yueh 0b15c56037 Added some more information to the security audit 2015-02-28 17:22:17 +01:00
yueh 39c26a72e2 Updated Forge and other dependencies 2015-02-27 23:11:44 +01:00
yueh d2f62ef98c Merge pull request #940 from bakaxyf/patch-1 
Update zh_CN.lang
 2015-02-27 15:20:40 +01:00
yueh 6476a519bb Added an option to disable the colored crafting status 2015-02-27 13:43:08 +01:00
yueh b8e2d73aa0 Merge pull request #824 from Eearslya/request-817 
Added feature request #817
 2015-02-27 12:36:02 +01:00
yueh 5a2b35ccd0 Merge pull request #855 from yueh/fix-cable-renderer 
Fixes cable render crash and covered cables render as smart.
 2015-02-27 11:07:40 +01:00