06f30b3daa
Reformat
Sebastian Hartte
2020-08-11 16:21:05 +02:00
68a02ed64b
Updated to 1.16.2-rc2
Sebastian Hartte
2020-08-11 16:20:31 +02:00
c59a6e34eb
Post-merge fixes
Sebastian Hartte
2020-08-11 02:12:26 +02:00
5b4f450fc3
Fix toLowerCase issues
Sebastian Hartte
2020-08-11 02:07:32 +02:00
ff0d38d56a
Merge fixes
Sebastian Hartte
2020-08-11 00:09:08 +02:00
d591a1492cFixes#4583: Confine fluix crafting into the same block (#4586)
yueh
2020-08-10 11:30:04 +02:00
d1ba26311b
One Spatial Dimension (#4570)
shartte
2020-08-10 11:29:07 +02:00
8733c2c11f
Fix Special Model Registration (#4577)
shartte
2020-08-10 11:25:26 +02:00
4230fc7325Fixes#4576: Append the amount to each button (#4580)
yueh
2020-08-09 13:23:24 +02:00
ef97381e5fFixes#4574 by referencing only non-pure fluix crystals in the fluix dust grinder recipe. (#4579)
v7.0.0
shartte
2020-08-09 12:28:43 +02:00
484af8baf3Fixes#4574 by referencing only non-pure fluix crystals in the fluix dust grinder recipe. (#4578)
shartte
2020-08-09 12:24:42 +02:00
9456f639d4
Simplify "unlit" quad loading and move to Mixins (#4569)
shartte
2020-08-09 01:27:19 +02:00
fe753c540bFixes#4571: When not used for displaying localized text, specify Locale.ROOT for toLowerCase/toUpperCase to avoid issues with locale-specific non-ASCII lowercase conversions for ASCII uppercase characters (i.e. turkish lowercase i for uppercase I). (#4573)
shartte
2020-08-08 14:56:51 +02:00
2fabab3a6a
Fix AO lighting for faces not fully snapped to block edges.
Sebastian Hartte
2020-08-08 02:20:31 +02:00
6f39bd8fe8
Move the nether quartz dust tag to the forge namespace and use it instead of AE's internal one. (#4568)
shartte
2020-08-07 23:13:02 +02:00
c7d3877129
Use the declared power drain for p2p tunnels (#4567)
yueh
2020-08-06 20:07:40 +02:00
89058448cf
Merged most recent master.
Sebastian Hartte
2020-08-06 00:46:20 +02:00
3c737d8d1e
Merge remote-tracking branch 'origin/master' into fabric/master
Sebastian Hartte
2020-08-05 23:40:58 +02:00
a807b4e3ad
Updated LBA to fix crashbug.
Sebastian Hartte
2020-08-05 23:28:45 +02:00
8f740be431
Respect max amount per slot.
Sebastian Hartte
2020-08-05 23:15:04 +02:00
77e07e9b3b
Remove shape logic in AEBaseInvBlockEntity and bring offering inventories in line with caps.
Sebastian Hartte
2020-08-05 23:12:39 +02:00
d04cd2a001
Actually implement WrapperFilteredItemHandler.
Sebastian Hartte
2020-08-05 23:12:03 +02:00
8f2b7fe16b
Forgot to add the hopper mixin.
Sebastian Hartte
2020-08-05 23:11:44 +02:00
239f8d027a
Fix network status screen showing translation keys.
Sebastian Hartte
2020-08-05 23:11:31 +02:00
c4c4d20303
Added Vanilla Hopper integration.
Sebastian Hartte
2020-08-05 23:06:56 +02:00
e7c57c0f61
Update the nominal face after the cull face, since updating the cull face will also force the nominal face to the cull face.
Sebastian Hartte
2020-08-05 23:06:09 +02:00
e0abe9b9a9Fixes#4559: Use visual bounding box for overlay (#4562)
yueh
2020-08-05 22:08:48 +02:00
1404806d3dFixes#4559: Use visual bounding box for overlay (#4561)
yueh
2020-08-05 21:52:34 +02:00
e19991f1f9Fixes#4547: Name clash between ITooltip#getWidth, ITooltip#getHeight and Vanilla Widget methods leads to missing methods at runtime, since the implementing methods will be remapped to SRG names, while referees of the interface will try to call the renamed methods by their name in the interface, leading to an AbstractMethodError. (#4558)
shartte
2020-08-05 18:21:13 +02:00
12e3fa9127
Makes formation planes a bit more consistent and less violent. (#4553)
yueh
2020-08-05 17:56:42 +02:00
3d97b1e3ecFixes#4551: Bounding box of annihilation planes is too small. (#4552)
shartte
2020-08-05 17:45:53 +02:00
9bc844738cFixes#4547: Name clash between ITooltip#getWidth, ITooltip#getHeight and Vanilla Widget methods leads to missing methods at runtime, since the implementing methods will be remapped to SRG names, while referees of the interface will try to call the renamed methods by their name in the interface, leading to an AbstractMethodError. (#4557)
shartte
2020-08-05 16:33:44 +02:00
eab6483bd7Fixes#4551: Bounding box of annihilation planes is too small.
Sebastian Hartte
2020-08-04 19:49:11 +02:00
6b1bccffb9
Apply the FE tunnel behaviour to the fluid tunnel (#4550) (#4555)
yueh
2020-08-04 23:37:15 +02:00
7ca9405c8b
Apply the FE tunnel behaviour to the fluid tunnel (#4550)
yueh
2020-08-04 17:57:59 +02:00
39959145a3
Revert "Apply the FE tunnel behaviour to the fluid tunnel (#4545)" (#4549)
yueh
2020-08-04 08:45:10 +02:00
184fe8c1fc
Fix items being lost when trying to stack items in the player inventory.
Sebastian Hartte
2020-08-03 22:29:03 +02:00
6f4722b393
Preliminary fix for AO-enabled auto-rotated blocks using the wrong face for getting lighting values.
Sebastian Hartte
2020-08-03 22:28:15 +02:00
22f552217f
Apply the FE tunnel behaviour to the fluid tunnel (#4545)
yueh
2020-08-03 21:39:34 +02:00
62bbc32763
Minor cleanup.
Sebastian Hartte
2020-08-03 20:31:30 +02:00
414b01bddb
Merge branch 'master' into fabric/master
Sebastian Hartte
2020-08-03 15:15:14 +02:00
63c251294e
Added custom item entity support via mixin.
Sebastian Hartte
2020-08-03 15:10:25 +02:00
872d8d33cb
Clean up global state for cable render mode (#4539)
shartte
2020-08-03 14:46:39 +02:00
1801302d8f
Fix SkyStone chest model issues that I had introduced back in 1.8. (#4542)
shartte
2020-08-03 14:46:23 +02:00
541f07a7e3
Fix output item stacking for condenser. Fix exposed inventories for condenser.
Sebastian Hartte
2020-08-03 13:06:00 +02:00
1693271660
Fix recipe transfer for recipes that are not 3x3.
Sebastian Hartte
2020-08-03 13:05:34 +02:00
3a12fa4843
Minor cleanup.
Sebastian Hartte
2020-08-03 13:05:23 +02:00
ba85da2c72
Fix SkyStone placement not immediately updating the compass.
Sebastian Hartte
2020-08-03 13:05:05 +02:00
469a1e205b
Reactivated REI
Sebastian Hartte
2020-08-02 22:31:27 +02:00
d238f6e8e4
Post-Merge fixes
Sebastian Hartte
2020-08-02 22:30:59 +02:00
c0fa8ab2dc
Merge remote-tracking branch 'origin/master' into fabric/master
Sebastian Hartte
2020-08-02 22:28:37 +02:00
a85ffec9f9
Unified Parameter-Names for Slots
Sebastian Hartte
2020-08-02 22:12:08 +02:00
3e5787be76
Fix internal inventory on the client not being updated.
Sebastian Hartte
2020-08-02 20:58:24 +02:00
52ec63413f
Fix client-side particle effects.
Sebastian Hartte
2020-08-02 20:58:03 +02:00
62ac6a0052
Fix server-side problems.
Sebastian Hartte
2020-08-02 18:09:21 +02:00
7f7b794c0b
Merge remote-tracking branch 'origin/master' into fabric/master
Sebastian Hartte
2020-08-02 15:46:11 +02:00
a97ebaf40d
Server can at least begin to launch now.
Sebastian Hartte
2020-08-02 15:45:59 +02:00
5fca946ef3
The lambda has to be replaced with an explicit method to annotate it with @OnlyIn.
Sebastian Hartte
2020-08-02 15:45:15 +02:00
80375c436d
Merge remote-tracking branch 'origin/master' into fabric/master
Sebastian Hartte
2020-08-02 15:41:50 +02:00
f8446209ce
Move CraftingMonitor rendering customization out to its own class to circumvent issues with a client-side only lambda method being generated in a common-side class.
Sebastian Hartte
2020-08-02 15:40:50 +02:00
9ce4a65203
Merge remote-tracking branch 'origin/master' into fabric/master
Sebastian Hartte
2020-08-02 15:15:39 +02:00
f5aee56a0b
Remove unused imports.
Sebastian Hartte
2020-08-02 15:14:28 +02:00
088627aedf
Remove client-only methods from ChargerBlock which could potentially create synthetic lambda methods that reference client-only classes (and are not stripped).
Sebastian Hartte
2020-08-02 15:13:20 +02:00
2655620fd0
Merge remote-tracking branch 'origin/master' into fabric-1.16
Sebastian Hartte
2020-08-02 14:37:29 +02:00
3c86f2eae4
Working on lifecycle.
Sebastian Hartte
2020-08-02 14:07:54 +02:00
cdba0b04fb
Change datagen task to use the source set outputs directly to avoid problems with modCompileOnly transitive dependencies.
Sebastian Hartte
2020-08-02 13:27:32 +02:00
c8d08f9726
Fixes sidedness issues that cropped up with 1.16 (#4533)
shartte
2020-08-01 22:16:57 +02:00
6fab7b91b7
Fixes 4529: Updated IPart to match new ICapabilityProvider (#4534) (#4536)
yueh
2020-08-01 21:57:26 +02:00
259d932946
Fixes 4529: Updated IPart to match new ICapabilityProvider (#4534)
yueh
2020-08-01 21:01:19 +02:00
a6fb17b008
Formatting Fixes
Sebastian Hartte
2020-08-01 17:24:48 +02:00
1b31185cdb
Ported to 1.16.2-pre
Sebastian Hartte
2020-08-01 17:14:12 +02:00
Sebastian Hartte