74480502b1
Merge remote-tracking branch 'origin/master' into fabric/master
...
# Conflicts:
# .github/workflows/release.yml
2020-08-18 00:20:46 +02:00
1f9707e256
Fixes #4602 : Prevent encoding invalid patterns and handle corrupted patterns a little more gracefully. ( #4608 )
2020-08-17 21:50:28 +02:00
954ce1442e
Fixes #4598 : Incorrectly rotated face for determining block lightlevel in ME Chest renderer. ( #4599 )
2020-08-17 21:43:16 +02:00
739277ab64
Removed unused tunnel types and files.
...
Added more tags, moved ender pearl dust to convention tag.
Added compatibility with TechReborn's chargers.
2020-08-17 19:00:32 +02:00
cf656e1540
Added initial TechReborn compatibility to the EnergyAcceptor.
2020-08-16 18:14:57 +02:00
ab6f46077b
Now really fix the encoded pattern not showing the tooltip with spaces.
2020-08-16 14:26:37 +02:00
e9c7312e98
Merge fixes
2020-08-16 14:26:17 +02:00
006cf2f8c1
Fix missing spaces in encoded pattern item.
2020-08-16 14:06:31 +02:00
636dce66e3
Hide more Items in REI.
2020-08-16 14:06:22 +02:00
2787796cd3
Fix Text#toString use on the crafting screens.
2020-08-16 14:06:05 +02:00
ee67c5ea50
Use different naming for fullbright, and always reset it back after setting it.
2020-08-16 14:05:10 +02:00
11d772a32b
Fixed client-side only Text methods.
2020-08-15 17:44:28 +02:00
f20f0e003e
Merge remote-tracking branch 'origin/master' into fabric/master
...
# Conflicts:
# gradle.properties
# src/main/java/appeng/server/subcommands/SpatialStorageCommand.java
2020-08-15 17:34:54 +02:00
0f100341d3
Added experimental site export mod.
2020-08-15 17:33:59 +02:00
73735c5cd5
Remove use of func_244388_a, which is client-only.
2020-08-15 17:29:36 +02:00
b1feeca41c
Fixup imports + formatting.
2020-08-15 03:18:23 +02:00
7d43d79682
Merge remote-tracking branch 'origin/master' into fabric/master
2020-08-15 03:16:03 +02:00
6c544f2211
Reformatted, and ported back some enhancements from the Forge version.
2020-08-15 02:51:03 +02:00
f455fd1994
Initial port to 1.16.2
2020-08-13 23:29:55 +02:00
1657c88681
Initial port to 1.16.2
2020-08-13 23:15:09 +02:00
fd67e0e5c6
Initial port to 1.16.2
2020-08-13 23:14:49 +02:00
0a2f03aa92
Moved Creative Tabs to Bootstrap.
2020-08-12 18:42:58 +02:00
b03a249da3
Remove libstructure
...
Migrate to 1.16.2 final
2020-08-12 18:23:32 +02:00
964559baa1
Merge remote-tracking branch 'origin/master' into fabric/master
...
# Conflicts:
# src/main/java/appeng/client/gui/implementations/NumberEntryWidget.java
2020-08-11 16:35:05 +02:00
87c2c94bd4
Use minus sign for minus buttons in number widget.
2020-08-11 16:31:20 +02:00
06f30b3daa
Reformat
2020-08-11 16:21:05 +02:00
68a02ed64b
Updated to 1.16.2-rc2
2020-08-11 16:20:31 +02:00
c59a6e34eb
Post-merge fixes
2020-08-11 02:12:26 +02:00
5b4f450fc3
Fix toLowerCase issues
2020-08-11 02:07:32 +02:00
ff0d38d56a
Merge fixes
2020-08-11 01:36:51 +02:00
d591a1492c
Fixes #4583 : Confine fluix crafting into the same block ( #4586 )
...
Fluix crystals will now spawn within an area around the center of the block as well as some tuned down motion while still maintaining some randomness.
2020-08-10 11:30:04 +02:00
d1ba26311b
One Spatial Dimension ( #4570 )
...
* Ported the "one spatial dimension" concept from pre-1.15
* Apply lighting updates after moving chunks.
Mark world data as dirty when changing it.
* Consolidated naming of spatial storage world/dimension.
Use server light manager to update lighting info in chunk.
* Save last transition information,
and add ae2 spatial command to interact with spatial storage.
* Formatting fixes.
* Improved docs for the origin generation.
Inverted condition on when the x/z axis are flipped.
Also added a helper to map a plot to a region file
* Remove TransitionResult since it's only used in lieu of a boolean.
Rework transition to make the checks BEFORE allocating a new cell.
* Removed unused imports.
Co-authored-by: yueh <yueh@users.noreply.github.com >
2020-08-10 11:29:07 +02:00
8733c2c11f
Fix Special Model Registration ( #4577 )
...
* Fixes #4575 by updating Forge (ModelRegistryEvent is a modbus event but was misflagged as not being one). And update Forge because their breaking change breaks our mod.
* Update gradle.properties
Co-authored-by: yueh <yueh@users.noreply.github.com >
* Update src/main/resources/META-INF/mods.toml
Co-authored-by: yueh <yueh@users.noreply.github.com >
Co-authored-by: yueh <yueh@users.noreply.github.com >
2020-08-10 11:25:26 +02:00
4230fc7325
Fixes #4576 : Append the amount to each button ( #4580 )
2020-08-09 13:23:24 +02:00
9456f639d4
Simplify "unlit" quad loading and move to Mixins ( #4569 )
...
* Simplified the UV loader concept: We only need it to make quads "unlit" which means that the lighting system is not applied to them. They always render at their full brightness.
* More documentation and slight cleanups.
2020-08-09 01:27:19 +02:00
fe753c540b
Fixes #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 )
2020-08-08 14:56:51 +02:00
2fabab3a6a
Fix AO lighting for faces not fully snapped to block edges.
2020-08-08 02:20:40 +02:00
c7d3877129
Use the declared power drain for p2p tunnels ( #4567 )
2020-08-06 20:07:40 +02:00
89058448cf
Merged most recent master.
2020-08-06 00:46:20 +02:00
3c737d8d1e
Merge remote-tracking branch 'origin/master' into fabric/master
...
# Conflicts:
# src/main/java/appeng/client/gui/AEBaseScreen.java
# src/main/java/appeng/client/gui/widgets/CustomSlotWidget.java
# src/main/java/appeng/client/gui/widgets/ITooltip.java
# src/main/java/appeng/client/gui/widgets/IconButton.java
# src/main/java/appeng/client/gui/widgets/ProgressBar.java
# src/main/java/appeng/client/gui/widgets/SettingToggleButton.java
# src/main/java/appeng/client/gui/widgets/ToggleButton.java
# src/main/java/appeng/container/slot/PlayerInvSlot.java
# src/main/java/appeng/fluids/client/gui/widgets/FluidSlotWidget.java
# src/main/java/appeng/fluids/client/gui/widgets/FluidTankWidget.java
# src/main/java/appeng/fluids/client/gui/widgets/OptionalFluidSlotWidget.java
# src/main/java/appeng/fluids/parts/FluidAnnihilationPlanePart.java
# src/main/java/appeng/parts/automation/AbstractFormationPlanePart.java
# src/main/java/appeng/parts/automation/AnnihilationPlanePart.java
# src/main/java/appeng/parts/automation/FormationPlanePart.java
# src/main/java/appeng/parts/automation/IdentityAnnihilationPlanePart.java
# src/main/java/appeng/parts/p2p/FluidP2PTunnelPart.java
2020-08-05 23:40:58 +02:00
8f740be431
Respect max amount per slot.
2020-08-05 23:15:04 +02:00
77e07e9b3b
Remove shape logic in AEBaseInvBlockEntity and bring offering inventories in line with caps.
2020-08-05 23:12:39 +02:00
d04cd2a001
Actually implement WrapperFilteredItemHandler.
2020-08-05 23:12:03 +02:00
239f8d027a
Fix network status screen showing translation keys.
2020-08-05 23:11:31 +02:00
c4c4d20303
Added Vanilla Hopper integration.
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.
2020-08-05 23:06:09 +02:00
822249dda8
Added missing @Override annotations.
2020-08-05 22:11:00 +02:00
1404806d3d
Fixes #4559 : Use visual bounding box for overlay ( #4561 )
2020-08-05 21:52:34 +02:00
12e3fa9127
Makes formation planes a bit more consistent and less violent. ( #4553 )
...
* Makes formation planes a bit more consistent and less violent.
Items will now have a slower speed when spawning as well as a narrower area to avoid having them glitch into a wall and be teleported around
* Removed debug output, added clarifying parenthesis and extracted method.
* Fixes various other issues with the formation plane
Also removed now useless code
Co-authored-by: Sebastian Hartte <sebastian@hartte.de >
2020-08-05 17:56:42 +02:00
8617dc8340
Plane Connection Refactor ( #4556 )
...
* Refactors all plane parts to use a common helper for
calculating connections to adjacent planes.
Also fixes problems with updating these connections on neighbor updates.
* Fix conflicting GuiSync ID.
* Slightly refactor PlaneConnectionHelper, and fix an issue where the bounding box was calculated incorrectly by using the wrong up-direction.
2020-08-05 17:45:33 +02:00
Sebastian Hartte