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

2364 commits

This branch
This branch
All branches
Author SHA1 Message Date
yueh
4b055a7f21 Merge pull request #1894 from yueh/update-readme 
Updated README.md and CONTRIBIBUTING.md
 2015-09-23 15:28:23 +02:00
yueh
759b6daa59 Merge pull request #1893 from yueh/fix-1892 
Fixes incorrect handling of prioritized inventories
 2015-09-23 15:28:13 +02:00
yueh
e1f03db7b3 Updated README.md and CONTRIBIBUTING.md 2015-09-23 14:27:11 +02:00
yueh
72518ad977 Merge pull request #1772 from yueh/feature-1569 
Feature 1569 Typesafe Integration Modules
 2015-09-23 00:20:00 +02:00
yueh
21fa2718f8 Merge pull request #1879 from yueh/fix-1878 
Fixes #1878: Now saves the dimensionlist correctly
 2015-09-23 00:15:36 +02:00
yueh
777bec184a Fixes 1878: Now saves worlddata more reliable. 2015-09-23 00:12:53 +02:00
yueh
b9d615c4ba Fixes incorrect handling of prioritized inventories 
Prioritized inventories are not longer used twice for storing leftover
items and thus finally reporting twice the amount of storable items when
they are the only possible option to store something.

Also fixes import buses now respecting the amount of storable items inside
the network instead of trying to place the exported items back and failing
on any restricted inventory, potentially voiding the overflow.

Fixes #1892
 2015-09-23 00:09:27 +02:00
yueh
40d339e173 Merge pull request #1888 from asd0210a/patch-3 
zh_tw.lang Updated
 2015-09-22 19:39:56 +02:00
asd0210a
20c1c4529a zh_tw.lang Updated 2015-09-21 10:15:20 +08:00
yueh
72399e5789 Merge pull request #1866 from yueh/fix-1865 
Fixes #1865: Spawn overflow items into the world
 2015-09-16 20:41:57 +02:00
yueh
f303c17ae0 First iteration of making integrations typesafe 2015-09-16 15:59:33 +02:00
yueh
26f13d4109 Fixes #1865: Spawn overflow items into the world 2015-09-11 20:05:17 +02:00
yueh
0df445c6a8 Merge pull request #1862 from yueh/feature-interface-9-slots 
Changed the interface to 9 slots to be consistent with every other machine
 2015-09-11 20:04:29 +02:00
thatsIch
8c817b2f85 Merge pull request #1851 from thatsIch/b-1850-add-second-optional-to-grindstone 
Fixes #1850: Fixed support for second optional output of the AE2 Grindstone
 2015-09-10 19:15:29 +02:00
yueh
7bd8cf3f59 Changed the interface to 9 slots to be consistent with every other machine 2015-09-08 00:19:05 +02:00
yueh
3ab6758e6c Merge pull request #1839 from yueh/fix-1833 
Fixed the order craftinglinks are notified for the last item.
 2015-09-05 18:00:41 +02:00
yueh
3dd948e4a4 Merge pull request #1854 from yueh/feature-recipes-refactoring 
Added a missing whitespace and removed duplicate ones.
 2015-09-05 18:00:22 +02:00
thatsIch
3bb9e4df97 Merge pull request #1634 from thatsIch/b-1588-wrong-oredict-name 
Fixes #1588: Charged Certus Quartz Ore was given a wrong name
 2015-09-03 23:50:53 +02:00
thatsIch
d17f045339 Merge pull request #1852 from Mazdallier/patch-1 
Update fr_FR.lang
 2015-09-02 17:03:16 +02:00
yueh
5817cde56b Added a missing whitespace and removed duplicate ones. 2015-09-02 16:51:37 +02:00
Mazdallier
45d94d4c2c Update fr_FR.lang 2015-09-02 10:00:16 +02:00
thatsIch
d893e52eb0 Fixes #1850: Fixed support for second optional output of the AE2 Grindstone 2015-09-01 23:58:40 +02:00
thatsIch
464a56ffc5 Fixes #1588: Charged Certus Quartz Ore was given a wrong name 2015-08-31 16:54:29 +02:00
yueh
40dcf711f6 Fixed the order craftinglinks are notified for the last item. 
Fixes #1833
 2015-08-28 13:29:24 +02:00
yueh
5dfca5eb93 Merge pull request #1776 from yueh/feature-1283 
Closes #1283: Add custom Callable to prevent memory leaks
 2015-08-22 23:22:17 +02:00
yueh
26daaf2232 Merge pull request #1805 from yueh/feature-recipes-refactoring 
Reorganizes the recipes in a more reasonable way.
 2015-08-22 23:21:14 +02:00
yueh
c2022a7208 Reorganizes the recipes in a more reasonable way. 
The recipes are now structured into multipe subfolder and split into more
distinct files, so the names are more appropriate and are better at
hinting which items the actually contain.

It also extends the RecipeResourceCopier to now handle the folder
recursively and extract all subdirectories and their files.

"import=" is currently requiring a relative path to the root directory
of the recipes. This would require a larger rewrite/refactoring, thus it
is kept for now until a potentially later changer.

This reverts splitting the oredict entries into their own directory and
moves them back into the recipes folder, as it currently is causing a
couple of issues like not being able to resolve the aliases or is not
working indev. But to keep it seperate it is now its own recipe file.

Fixes #1791
Reverts #1635
 2015-08-21 12:23:20 +02:00
yueh
74c2e1fab9 Merge pull request #1823 from yueh/fix-1810 
Fixes #1810: Removes a CompassReader once the world is unloaded.
 2015-08-20 23:05:58 +02:00
yueh
0de7a2d83a Closes #1283: Add custom Callable to prevent memory leaks 2015-08-20 21:04:06 +02:00
yueh
517a832ac1 Fixes #1810: Removes a CompassReader once the world is unloaded. 
This should no longer keep a reference to a World around and potentially
keep them loaded.
Also added a finalize() to CompassRegion to ensure the file is closed on a
GC.

Some cleanup regarding member order, final, etc
 2015-08-20 19:04:33 +02:00
yueh
1ecc811559 Merge pull request #1813 from yueh/fix-1481 
Fixes #1481: Not using the right itemcount in a few cases
 2015-08-16 15:39:33 +02:00
yueh
7dd283cf9f Fixes 1481: Not using the right itemcount in a few cases 2015-08-16 15:32:58 +02:00
yueh
a12ef1e534 Merge pull request #1807 from yueh/fix-1806 
Wrong culling direction when rendering inscriber
 2015-08-15 21:25:29 +02:00
yueh
a567dcc026 Wrong culling direction when rendering inscriber 
Fixes #1806
 2015-08-15 19:48:12 +02:00
yueh
7f72ba97f0 Merge pull request #1769 from yueh/feature-1726 
Closes #1726: Added Pressure P2P tunnel (PneumaticCraft)
 2015-08-15 18:12:37 +02:00
yueh
c3db5ef9e4 Merge pull request #1787 from thatsIch/b-1786-turkish-locale 
Fixes #1786: Locale critical code now uses the english local. Fixes Turkish Problem.
 2015-08-15 18:11:48 +02:00
yueh
f955febb5d Merge pull request #1782 from yueh/fix-1781 
Fixes #1781: Do not crash after the tileentity was removed
 2015-08-15 18:10:44 +02:00
yueh
3115147edf Merge pull request #1774 from yueh/fix-1481 
Fixes #1481: Updated cell itemcount when empty
 2015-08-15 18:10:30 +02:00
yueh
1cec5922a0 Merge pull request #1773 from yueh/fix-1601 
Fixes #1601: Do not allow 0 as stacksize for recipes
 2015-08-15 18:10:21 +02:00
thatsIch
322b296639 Fixes #1786: Locale critical code now uses the english local for transmission. Fixes Turkish Problem. 
Applied English Locale where localization is not expected as in internal recipe handling and IMC handling, basically which interacts with public API where we either require to enforce the incoming text with regex ([a-z0-9]) or just expect proper usage of the API, but with just using upper cases in recipe files it would break in Turkish Locale like

ALIAS

another option would have been to use `equalsIgnoreCase` in some cases, but not all applicable
 2015-08-10 13:34:31 +02:00
yueh
d1244f59ed Fixes #1781 Do not crash after the tileentity was removed 2015-08-08 14:14:38 +02:00
yueh
6a18102ea0 Fixes #1481: Updated cell itemcount when empty 2015-08-06 23:04:57 +02:00
yueh
300a9618b6 Fixes #1601: Do not allow 0 as stacksize for recipes 2015-08-06 22:47:24 +02:00
yueh
dfb435ae7d Removed unused imports 2015-08-06 19:49:56 +02:00
yueh
1728f683c3 Closes #1726: Added Pressure P2P tunnel (PneumaticCraft) 2015-08-06 19:37:19 +02:00
yueh
c0b62fd519 Added missing annotations 2015-08-06 19:08:33 +02:00
yueh
67c901966e Non static access of static members 2015-08-06 19:08:32 +02:00
yueh
a5287f6779 Qualified field and method access 2015-08-06 19:08:04 +02:00
yueh
8234c6dbb5 Added missing blocks for control statements 2015-08-06 19:08:03 +02:00
yueh
9c8deac9de Code format 2015-08-06 19:08:02 +02:00