Commit graph

1943 commits

Author SHA1 Message Date
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
yueh
16218e46ec Merge pull request #926 from yueh/fix-910
Fixes #910, report the correct hitbox to fmp
2015-02-27 11:07:10 +01:00
yueh
27b692823c Merge pull request #947 from yueh/fix-943
Fixes #943 readded callable for simultaneous block breaking
2015-02-27 11:06:59 +01:00
yueh
68aaec16bc Improved OreHelper performance 2015-02-27 00:17:33 +01:00
yueh
ec8d393403 Fixes #943 readded callable for simultaneous block breaking 2015-02-26 22:41:51 +01:00
bakaxyf
27e5eac6aa Update zh_CN.lang 2015-02-25 13:47:40 +08:00
yueh
ca521935e0 Fixes #910, report the correct hitbox to fmp 2015-02-22 12:42:39 +01:00
yueh
f60798129c Fixes cable render crash and covered cables render as smart. 2015-02-06 19:39:08 +01:00
AlgorithmX2
3e90f354c5 Updated Texture / Model License to be specific. 2015-02-03 10:01:48 -06:00
yueh
a27ed6d9ba Merge pull request #840 from yueh/remove-trailing-whitespace
remove trailing whitespaces
2015-02-03 12:05:17 +01:00
yueh
b18addbf37 remove trailing whitespaces 2015-02-03 12:04:13 +01:00
Eearslya
3fa501d726 Added feature request #817
Crafting CPU GUI now shows a yellow background on items being crafted, and a yellow background on scheduled items.
2015-02-02 06:37:17 -08:00
FireBall
ef3cb0a455 Merge pull request #781 from yueh/fix-p2p-missing-super-call
Added missing super calls
2015-01-22 11:05:23 -05:00
yueh
be82dfec1f Added missing super calls 2015-01-19 22:51:41 +01:00
Chris
8eb5ad01cf Merge pull request #776 from al-myr/patch-1
Update pt_BR.lang
2015-01-19 12:22:42 -08:00
Chris
a3c5e4cb05 Merge pull request #738 from TheJulianJES/Crank-Fix
Fix #701
2015-01-19 12:15:05 -08:00