Commit Graph

3683 Commits

Author SHA1 Message Date
Sebastian Hartte cf656e1540 Added initial TechReborn compatibility to the EnergyAcceptor. 2020-08-16 18:14:57 +02:00
Sebastian Hartte ab6f46077b Now really fix the encoded pattern not showing the tooltip with spaces. 2020-08-16 14:26:37 +02:00
Sebastian Hartte e9c7312e98 Merge fixes 2020-08-16 14:26:17 +02:00
Sebastian Hartte 006cf2f8c1 Fix missing spaces in encoded pattern item. 2020-08-16 14:06:31 +02:00
Sebastian Hartte 636dce66e3 Hide more Items in REI. 2020-08-16 14:06:22 +02:00
Sebastian Hartte 2787796cd3 Fix Text#toString use on the crafting screens. 2020-08-16 14:06:05 +02:00
Sebastian Hartte ee67c5ea50 Use different naming for fullbright, and always reset it back after setting it. 2020-08-16 14:05:10 +02:00
Sebastian Hartte 506c516384 Enable publishing again fabric/v8.1.0-alpha.1 2020-08-15 18:54:07 +02:00
Sebastian Hartte 011455e327 Further testing tags 2020-08-15 18:42:20 +02:00
Sebastian Hartte 11d772a32b Fixed client-side only Text methods. 2020-08-15 17:44:28 +02:00
Sebastian Hartte 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
Sebastian Hartte 0f100341d3 Added experimental site export mod. 2020-08-15 17:33:59 +02:00
Sebastian Hartte 73735c5cd5 Remove use of func_244388_a, which is client-only. 2020-08-15 17:29:36 +02:00
Sebastian Hartte c1713f1682 Bump to Forge 33.0.5 v8.1.0-alpha.1 2020-08-15 14:32:53 +02:00
Sebastian Hartte b1feeca41c Fixup imports + formatting. 2020-08-15 03:18:23 +02:00
Sebastian Hartte 7d43d79682 Merge remote-tracking branch 'origin/master' into fabric/master 2020-08-15 03:16:03 +02:00
Sebastian Hartte 5cd148ab5a Added curseforge publishing. 2020-08-15 02:51:32 +02:00
Sebastian Hartte 6c544f2211 Reformatted, and ported back some enhancements from the Forge version. 2020-08-15 02:51:03 +02:00
Sebastian Hartte f455fd1994 Initial port to 1.16.2 2020-08-13 23:29:55 +02:00
Sebastian Hartte 1657c88681 Initial port to 1.16.2 2020-08-13 23:15:09 +02:00
Sebastian Hartte fd67e0e5c6 Initial port to 1.16.2 2020-08-13 23:14:49 +02:00
Sebastian Hartte 0a2f03aa92 Moved Creative Tabs to Bootstrap. 2020-08-12 18:42:58 +02:00
Sebastian Hartte b03a249da3 Remove libstructure
Migrate to 1.16.2 final
2020-08-12 18:23:32 +02:00
Sebastian Hartte 6f0fc7d189 Fabric Snapshots 2020-08-11 20:08:07 +02:00
Sebastian Hartte fd8eecbe93 Fabric Snapshots 2020-08-11 20:04:43 +02:00
Sebastian Hartte 0a60b3ebb2 Fabric Snapshots 2020-08-11 20:01:50 +02:00
Sebastian Hartte 15522f5ce7 Fabric Snapshots 2020-08-11 19:51:34 +02:00
Sebastian Hartte 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
Sebastian Hartte 87c2c94bd4 Use minus sign for minus buttons in number widget. v8.0.0-beta.1 v8.0.0-alpha.3 2020-08-11 16:31:20 +02:00
Sebastian Hartte 06f30b3daa Reformat 2020-08-11 16:21:05 +02:00
Sebastian Hartte 68a02ed64b Updated to 1.16.2-rc2 2020-08-11 16:20:31 +02:00
Sebastian Hartte c59a6e34eb Post-merge fixes 2020-08-11 02:12:26 +02:00
Sebastian Hartte 5b4f450fc3 Fix toLowerCase issues 2020-08-11 02:07:32 +02:00
Sebastian Hartte ff0d38d56a Merge fixes 2020-08-11 01:36:51 +02:00
yueh 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
shartte 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
shartte 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
yueh 4230fc7325 Fixes #4576: Append the amount to each button (#4580) 2020-08-09 13:23:24 +02:00
shartte 484af8baf3 Fixes #4574 by referencing only non-pure fluix crystals in the fluix dust grinder recipe. (#4578) 2020-08-09 12:24:42 +02:00
shartte 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
shartte 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
Sebastian Hartte 2fabab3a6a Fix AO lighting for faces not fully snapped to block edges. 2020-08-08 02:20:40 +02:00
shartte 6f39bd8fe8 Move the nether quartz dust tag to the forge namespace and use it instead of AE's internal one. (#4568) 2020-08-07 23:13:02 +02:00
yueh c7d3877129 Use the declared power drain for p2p tunnels (#4567) 2020-08-06 20:07:40 +02:00
Sebastian Hartte 89058448cf Merged most recent master. 2020-08-06 00:46:20 +02:00
Sebastian Hartte 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
Sebastian Hartte a807b4e3ad Updated LBA to fix crashbug. 2020-08-05 23:28:45 +02:00
Sebastian Hartte 8f740be431 Respect max amount per slot. 2020-08-05 23:15:04 +02:00
Sebastian Hartte 77e07e9b3b Remove shape logic in AEBaseInvBlockEntity and bring offering inventories in line with caps. 2020-08-05 23:12:39 +02:00
Sebastian Hartte d04cd2a001 Actually implement WrapperFilteredItemHandler. 2020-08-05 23:12:03 +02:00