4ad31f5066
Integrated groups.recipes into the JSON recipes a bit more cleanly.
...
Groups in groups.recipes that only had 1 item in the group haven't been converted into the JSON system.
That means "monitor" and "densecable" were just left as is.
2017-07-22 02:08:01 +02:00
f70e97046f
Fixes PatternTerminal crafting issue ( #2964 )
2017-07-22 01:12:07 +02:00
3a053d9ebe
Fixes PatternTerminal clearing crafting slot on tried crafting ( #2963 )
2017-07-22 01:11:42 +02:00
fbaff342e4
Fixed cable anchor recipe. Apparently 32767 is the magic wildcard number we were looking for.
2017-07-22 00:33:16 +02:00
f0baea3be8
Fixes a ItemStack deletion issue in the grindstone ( #2962 )
...
Fixes the Grinder eating the item in case of an input ItemStack with size equal to one.
2017-07-21 23:03:13 +02:00
fd7e393d23
Updated github docs
2017-07-21 22:05:38 +02:00
a24ed38e90
Added missing Override annotations
2017-07-20 21:28:16 +02:00
15582fd1df
Always use qualified access for fields and methods
2017-07-20 21:27:22 +02:00
f9cad0758d
Always use {} for control statements
2017-07-20 21:24:58 +02:00
406013142e
Superfluous whitespace removal
2017-07-20 21:23:01 +02:00
7de90ed0ae
Finally use Java7 <>
2017-07-20 21:21:45 +02:00
8ec8babb6a
Organised imports
2017-07-20 21:18:49 +02:00
621910df91
Format sourcecode
2017-07-20 21:17:10 +02:00
66437897be
Removed superfluous thirdparty sourceset
2017-07-20 20:59:37 +02:00
7414840530
Fixed facades not showing up before F3+A. This is caused by the BlockRendererDispatcher not existing yet in the ModelBakeEvent event.
2017-07-19 19:08:49 +02:00
0741e4ae09
Cosmetic change to smart fluix recipe. (Looks nicer in JEI)
2017-07-19 13:55:39 +02:00
87f6a63f47
Fixed seeds and P2P bus not having a localised name.
2017-07-19 13:55:09 +02:00
b0950683a1
Updated pack.mcmeta to new version.
2017-07-19 13:54:08 +02:00
009cf8ac40
Fixed fluix pearl and Dense Smart Fluix recipes.
2017-07-19 13:52:25 +02:00
4c272de77f
Temporary fix for serverside JEI and valueconfig packets.
...
It's not pretty but should do until we rewrite the packet/network handler.
2017-07-19 13:50:21 +02:00
6648d18f00
Changed the Parts and Material enum to be more java compliant.
...
Renamed Dense Cables to Dense Smart Cables.
2017-07-16 02:22:30 +02:00
16b5b5aea2
Fixed setting a Tunnel Type to "Forge Energy". Forgot to edit the part that actually sets the tunnel.
2017-07-15 01:19:29 +02:00
e20697a7d9
Added the Forge Energy line to the language files.
2017-07-15 00:51:08 +02:00
dc0447d137
This layer isn't needed for the traversal of Forge Energy.
2017-07-15 00:49:13 +02:00
577b1fa757
Add a method to attune the P2P Tunnel by (supported) ModId, or check for ForgeEnergy support if it's not listed.
2017-07-14 22:54:19 +02:00
3d69dc9bc4
Merge branch 'rv5-1.12' of github.com:GuntherDW/Applied-Energistics-2 into rv5-1.12
2017-07-14 21:52:24 +02:00
66c87a2fa2
Re-enabled the RF and IC2 handler, as well as their P2P tunnels. Added Forge Energy P2P tunnel.
2017-07-14 21:52:04 +02:00
fdab91323c
Re-enabled the WAILA handler, using Hwyla.
2017-07-14 21:48:20 +02:00
98a8c3d06b
Forgot to remove extra debug line before pushing to github.
2017-07-14 16:21:16 +02:00
458356a2be
First attempt at combining the Block registration and TE registration whilst still keeping support for addons.
...
It might need some refinement in the future.
2017-07-14 04:47:40 +02:00
c91b432e09
Added exceptions to the Recipe handlers. Don't crash, but log to the console what went wrong.
2017-07-13 22:18:59 +02:00
d67d93b343
Fixed a couple recipes that were wrong during the transition.
2017-07-13 11:31:26 +02:00
f6f8da28af
Fixed Recipe handler only giving out 1 item instead of the amount specified in the json.
2017-07-13 11:29:00 +02:00
76fd3c1166
Fix potential crash in the recipes when the material was replaced.
2017-07-13 09:30:39 +02:00
3da881829e
Fixed recipe crash when another mod registers a wooden gear.
...
I'll have to go through every other recipe later.
2017-07-13 09:03:18 +02:00
90ee7fb15d
Fixed last commit. I should never trust kate's syntax hilighting in the future again.
2017-07-13 04:49:10 +02:00
e5e2714273
Really fixed NotNull this time. My local git repo got desync'ed for a bit.
2017-07-13 04:44:05 +02:00
1534521362
Fixed wrong interface being used for the NonNull ItemStacks causing issues.
2017-07-13 04:21:15 +02:00
0f8204cd93
Fixed serversided issue. Forgot to check for uses of isEnabled before changing it to a clientside only method.
2017-07-13 04:18:33 +02:00
eb11845a2f
Fixed applying the type of tunnel for P2P tunnels.
...
This was caused by the enforced lowercase mod id's and item names since 1.11.
2017-07-12 06:04:06 +02:00
fe213e5ac5
Add item handler capabilities to Item P2P tunnels.
2017-07-12 06:02:31 +02:00
25c82b2c9f
Forgot to remove test recipe.
2017-07-11 05:12:47 +02:00
d03faae983
JSON Recipes initial import.
...
Moved the old recipe handler to a different direct to not confuse the vanilla/forge JSON loader.
2017-07-11 04:50:02 +02:00
76e19874cf
Small code cosmetics and null checks update.
2017-07-09 13:44:11 +02:00
1975c3c262
Moved makeUnique() a bit back to fix almost every AE item being disabled.
2017-07-09 13:43:16 +02:00
720feb4f16
Iron nuggets are vanilla nowadays. There's no sense in keeping them around in AE2.
2017-07-09 11:33:22 +02:00
588579d67f
Updated CoFH RF API. Removed the old API from thirdparty/.
...
Those files are available from their maven server now.
2017-07-09 10:34:34 +02:00
043f6e9919
Fixed ME Drive not rendering in-world.
2017-07-09 10:10:56 +02:00
cc7824a0e5
Merge remote-tracking branch 'origin/rv5-1.12' into rv5-1.12
2017-07-09 07:18:45 +02:00
a57cd3f580
More 1.12 shenanigans. Still far from done.
2017-07-09 07:17:24 +02:00
Gunther De Wachter