thatsIch
e52400bf26
Merge pull request #1911 from thatsIch/e-scope-too-broad
...
Reduce scope of variables
2015-09-26 20:23:57 +02:00
thatsIch
0387d30d1c
Reduce scope of variables
2015-09-26 20:07:51 +02:00
yueh
f4ff28d2a6
Merge pull request #1877 from yueh/feature-itemlist-refactoring
...
ItemList refactoring
2015-09-26 19:51:47 +02:00
yueh
1bec11f616
ItemList refactoring
...
Splitted the ItemList and MeaningfulIterator into an item and fluid
version.
Added an IdentityHashMap as additional item layer to the ItemList for a
faster access.
Refactored FluidList, findFuzzy will now return the same fluid instead of
an empty collection.
2015-09-26 19:00:59 +02:00
yueh
9b685d5b73
Merge pull request #1915 from thatsIch/e-remove-base-module
...
Remove base module
2015-09-26 11:57:04 +02:00
yueh
4b984452ad
Merge pull request #1914 from thatsIch/e-prefer-is-empty
...
prefer isEmpty over length() == 0
2015-09-26 11:56:50 +02:00
yueh
b3e33b1c3b
Merge pull request #1912 from thatsIch/e-replace-with-array-initializer
...
Replace with array initializer
2015-09-26 11:56:44 +02:00
yueh
572c2bb403
Merge pull request #1910 from thatsIch/e-redundant-type-casts
...
Remove redundant type casts
2015-09-26 11:56:28 +02:00
yueh
645c2b0e1c
Merge pull request #1907 from yueh/fix-1905
...
Fixes #1905 : Export bus now considers failed crafting requests
2015-09-26 11:40:38 +02:00
thatsIch
6952a2f958
Remove base module
2015-09-25 23:28:57 +02:00
thatsIch
dbf84428a5
Remove unnecessary semicolon
2015-09-25 23:19:34 +02:00
thatsIch
734d50d086
prefer isEmpty over length() == 0
2015-09-25 23:18:27 +02:00
thatsIch
4b3d7c7d03
Replace with array initializer
...
this can be done through http://docs.oracle.com/javase/specs/jls/se6/html/arrays.html#10.6
2015-09-25 23:04:36 +02:00
thatsIch
7a220e253d
Remove unused imports
2015-09-25 22:33:03 +02:00
thatsIch
80e1a2863b
Remove redundant type casts
2015-09-25 22:30:38 +02:00
yueh
92331b4d2e
Fixes #1905 : Export bus now considers failed crafting requests
...
The export bus will now no longer speed up, if more than 1 of the last
crafting requests failed and slow down, if more then 5 failed.
Some code cleanup and moved the custom iterator into the helper package
as it is clearly related to the craftingtracker and not the export bus.
2015-09-25 19:58:07 +02:00
yueh
bcba2329b7
Merge pull request #1902 from yueh/fix-1896
...
Fixes 1896: Only update a monitor if the text would change
2015-09-23 23:46:43 +02:00
yueh
597e17b52b
Fixes 1896: Only update a monitor if the text would change
2015-09-23 22:28:50 +02:00
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
