yueh
5817cde56b
Added a missing whitespace and removed duplicate ones.
2015-09-02 16:51:37 +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
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
yueh
c21a44d8c0
Organize imports
2015-08-06 19:06:49 +02:00
yueh
3c62734c87
Merge pull request #1770 from bakaxyf/master
...
Update zh_CN.lang
2015-08-06 13:25:45 +02:00
bakaxyf
5b6b14cde7
Update zh_CN.lang
2015-08-06 15:32:15 +08:00
yueh
51c92d3dfb
Merge pull request #1732 from yueh/fix-1718
...
Use the correct resolver for crystal seeds
2015-07-25 18:29:13 +02:00
yueh
37295745cf
Merge pull request #1696 from yueh/feature-85
...
Adds a round robin and random mode to export buses.
2015-07-25 18:29:02 +02:00
yueh
c3ce9d9542
Adds a round robin and random mode to export buses.
...
Resolves #85
2015-07-25 17:27:56 +02:00
yueh
15993eb3c7
Merge pull request #1695 from yueh/b-prevents-crafting-of-disabled-parts
...
Prevents crafting of disabled parts
2015-07-24 22:27:21 +02:00
yueh
48d1a5aa88
Merge pull request #1687 from yueh/fix-1686
...
Fixes #1686 : Let PlayerRegistry handle nonexistent players
2015-07-24 22:26:00 +02:00
yueh
3826b3b51f
Merge pull request #1730 from yueh/fix-1728
...
Fixes #1728 Mark the entity as dead before spawning overflow
2015-07-24 22:25:43 +02:00
yueh
7833ff5eab
Merge pull request #1733 from yueh/fix-1710
...
Use the correct culling face for the meteor compass
2015-07-24 22:24:08 +02:00
yueh
6f5a2888c0
Fixes #1710 Use the correct culling face for the meteor compass
2015-07-22 16:58:50 +02:00
yueh
6d42032738
Fixes #1718 Use the correct resolver for crystal seeds
2015-07-22 16:00:18 +02:00
yueh
1a38e5ba94
Fixes #1728 Mark the entity as dead before spawning overflow
2015-07-22 15:07:08 +02:00
yueh
ff3e51018f
Fixes #1686 : Let PlayerRegistry handle nonexistent players
2015-07-14 22:48:37 +02:00
yueh
65c47d4c4e
Merge pull request #1633 from TheCricket/patch-2
...
Allows the automation of Vibration Chambers with lava buckets
2015-07-14 21:31:16 +02:00
yueh
d7486fec3c
Merge pull request #1647 from yueh/fix-1646
...
Fixes #1646 Save GridStorage properly
2015-07-14 21:30:50 +02:00
yueh
796b6dc7a2
Merge pull request #1709 from yueh/fix-1706
...
Fixes #1706 Adds a test to disable unsupported BetterStorage integration
2015-07-14 21:30:30 +02:00
yueh
67b261cc7c
Merge pull request #1698 from yueh/fix-1648
...
Fixes #1648 Removes unecessary cast to BlockQuartzTorch
2015-07-14 21:30:19 +02:00
yueh
3fb3f70392
Merge pull request #1678 from yueh/fix-1673
...
Removed overly defensive code and ensure GL state to be restored.
2015-07-14 21:30:03 +02:00
yueh
49321d72c1
Merge pull request #1667 from yueh/fix-1666
...
Fixes #1666 Missing check for the memory card
2015-07-14 21:29:49 +02:00
yueh
62fb0dc7f7
Merge pull request #1665 from yueh/fix-1656
...
Fixes #1656 Reduces the amount of block updates a controller sends.
2015-07-14 21:29:39 +02:00
yueh
e9e9535f2a
Merge pull request #1635 from thatsIch/e-export-oredicts
...
Exports the ore-dicts out of the recipe files
2015-07-14 21:29:18 +02:00
yueh
ab9f4e7fd7
Merge pull request #1604 from yueh/e-immutable-inscriber-recipes
...
Changed to immutable list to prevent direct modifcations
2015-07-14 21:28:41 +02:00
yueh
1080b65404
Fixes #1706 Adds a test to disable unsupported BetterStorage integration
2015-07-14 20:49:39 +02:00
yueh
c823e1464b
Ensure that disabled parts are actually disabled and removed.
2015-07-10 18:35:22 +02:00
yueh
4ba722cb51
Fixes #1648 Removes unecessary cast to BlockQuartzTorch
2015-07-10 18:16:27 +02:00
thatsIch
91b8d30a15
Fixes #1474 : Prevents crafting of disabled recipes and deletes invalid parts
2015-07-09 13:35:31 +02:00
yueh
3e6231492e
Merge pull request #1684 from yueh/fix-1611
...
Reset the lastUsedChannels on a gridstorage change
2015-07-06 09:58:43 +02:00
