f3c44c64c2
Merge remote-tracking branch 'origin/master' into fabric/master
...
# Conflicts:
# build.gradle
# gradle.properties
# src/api/java/appeng/api/util/DimensionalCoord.java
# src/main/java/appeng/block/paint/PaintSplotchesBakedModel.java
# src/main/java/appeng/bootstrap/BlockDefinitionBuilder.java
# src/main/java/appeng/client/gui/AEBaseScreen.java
# src/main/java/appeng/client/gui/implementations/CraftAmountScreen.java
# src/main/java/appeng/client/gui/implementations/CraftConfirmScreen.java
# src/main/java/appeng/client/gui/implementations/CraftingStatusScreen.java
# src/main/java/appeng/client/gui/implementations/InterfaceScreen.java
# src/main/java/appeng/client/gui/implementations/InterfaceTerminalScreen.java
# src/main/java/appeng/client/gui/implementations/LevelEmitterScreen.java
# src/main/java/appeng/client/gui/implementations/NumberEntryWidget.java
# src/main/java/appeng/client/gui/implementations/PriorityScreen.java
# src/main/java/appeng/client/gui/widgets/IconButton.java
# src/main/java/appeng/client/gui/widgets/NumberBox.java
# src/main/java/appeng/client/gui/widgets/SettingToggleButton.java
# src/main/java/appeng/client/gui/widgets/TabButton.java
# src/main/java/appeng/client/render/DelegateBakedModel.java
# src/main/java/appeng/client/render/DummyFluidDispatcherBakedModel.java
# src/main/java/appeng/client/render/FacadeBakedItemModel.java
# src/main/java/appeng/client/render/FacadeDispatcherBakedModel.java
# src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyBakedModel.java
# src/main/java/appeng/client/render/crafting/EncodedPatternBakedModel.java
# src/main/java/appeng/client/render/model/AutoRotatingBakedModel.java
# src/main/java/appeng/client/render/model/BiometricCardBakedModel.java
# src/main/java/appeng/client/render/model/ColorApplicatorBakedModel.java
# src/main/java/appeng/client/render/model/GlassBakedModel.java
# src/main/java/appeng/client/render/model/MemoryCardBakedModel.java
# src/main/java/appeng/client/render/model/SkyCompassBakedModel.java
# src/main/java/appeng/client/render/tesr/ChestTileEntityRenderer.java
# src/main/java/appeng/container/AEBaseContainer.java
# src/main/java/appeng/container/ContainerLocator.java
# src/main/java/appeng/container/guisync/SyncData.java
# src/main/java/appeng/container/implementations/CellWorkbenchContainer.java
# src/main/java/appeng/container/implementations/CondenserContainer.java
# src/main/java/appeng/container/implementations/ContainerHelper.java
# src/main/java/appeng/container/implementations/CraftConfirmContainer.java
# src/main/java/appeng/container/implementations/CraftingCPUContainer.java
# src/main/java/appeng/container/implementations/CraftingCPURecord.java
# src/main/java/appeng/container/implementations/CraftingStatusContainer.java
# src/main/java/appeng/container/implementations/IOPortContainer.java
# src/main/java/appeng/container/implementations/InscriberContainer.java
# src/main/java/appeng/container/implementations/InterfaceTerminalContainer.java
# src/main/java/appeng/container/implementations/LevelEmitterContainer.java
# src/main/java/appeng/container/implementations/MEMonitorableContainer.java
# src/main/java/appeng/container/implementations/MolecularAssemblerContainer.java
# src/main/java/appeng/container/implementations/PatternTermContainer.java
# src/main/java/appeng/container/implementations/PriorityContainer.java
# src/main/java/appeng/container/implementations/QuartzKnifeContainer.java
# src/main/java/appeng/container/implementations/SpatialIOPortContainer.java
# src/main/java/appeng/container/implementations/VibrationChamberContainer.java
# src/main/java/appeng/container/implementations/WirelessTermContainer.java
# src/main/java/appeng/core/AEConfig.java
# src/main/java/appeng/core/AppEngBootstrap.java
# src/main/java/appeng/core/Registration.java
# src/main/java/appeng/core/api/definitions/ApiItems.java
# src/main/java/appeng/core/features/registries/WorldGenRegistry.java
# src/main/java/appeng/core/sync/network/NetworkHandler.java
# src/main/java/appeng/core/worlddata/WorldData.java
# src/main/java/appeng/datagen/providers/loot/BlockDropProvider.java
# src/main/java/appeng/debug/ChunkLoaderBlockEntity.java
# src/main/java/appeng/debug/ReplicatorCardItem.java
# src/main/java/appeng/entity/GrowingCrystalEntity.java
# src/main/java/appeng/fluids/client/gui/FluidLevelEmitterScreen.java
# src/main/java/appeng/fluids/client/gui/FluidTerminalScreen.java
# src/main/java/appeng/fluids/container/FluidConfigurableContainer.java
# src/main/java/appeng/fluids/container/FluidInterfaceContainer.java
# src/main/java/appeng/fluids/container/FluidLevelEmitterContainer.java
# src/main/java/appeng/fluids/container/FluidTerminalContainer.java
# src/main/java/appeng/fluids/util/AEFluidInventory.java
# src/main/java/appeng/items/misc/CrystalSeedItem.java
# src/main/java/appeng/items/misc/CrystalSeedRendering.java
# src/main/java/appeng/items/storage/SpatialStorageCellItem.java
# src/main/java/appeng/me/cluster/implementations/QuantumCluster.java
# src/main/java/appeng/mixins/feature/ConfiguredFeaturesAccessor.java
# src/main/java/appeng/mixins/spatial/BiomesMixin.java
# src/main/java/appeng/mixins/spatial/DimensionTypeMixin.java
# src/main/java/appeng/mixins/spatial/EntityMixin.java
# src/main/java/appeng/mixins/spatial/SkyRenderMixin.java
# src/main/java/appeng/mixins/structure/BiomeAccessor.java
# src/main/java/appeng/mixins/structure/GenerationSettingsAccessor.java
# src/main/java/appeng/parts/automation/FormationPlanePart.java
# src/main/java/appeng/parts/automation/PlaneBakedModel.java
# src/main/java/appeng/server/subcommands/SpatialStorageCommand.java
# src/main/java/appeng/server/subcommands/TestMeteoritesCommand.java
# src/main/java/appeng/server/subcommands/TestOreGenCommand.java
# src/main/java/appeng/spatial/SpatialStorageBiome.java
# src/main/java/appeng/spatial/SpatialStorageChunkGenerator.java
# src/main/java/appeng/spatial/SpatialStorageDimensionIds.java
# src/main/java/appeng/spatial/SpatialStorageHelper.java
# src/main/java/appeng/util/Platform.java
# src/main/java/appeng/worldgen/BiomeModifier.java
# src/main/java/appeng/worldgen/meteorite/MeteoriteStructureStart.java
# src/main/java/appeng/worldgen/meteorite/fallout/FalloutCopy.java
# src/main/resources/assets/appliedenergistics2/textures/guis/states.png
2020-09-20 14:11:22 +02:00
971a9d22e8
Improvements to the usability of the number entry widgets (Priority, Level Emitter, Craft Amount): ( #4737 )
...
- Fixed tab order
- Introduced focus state for corner buttons
- Allowed the player to enter any text, but add validation that only persist it if it is a valid number
- Enter will now confirm these dialogs and return to the previous dialog
- The text field is automatically focused and its contents are selected
2020-09-19 16:27:29 +02:00
b1feeca41c
Fixup imports + formatting.
2020-08-15 03:18:23 +02:00
6c544f2211
Reformatted, and ported back some enhancements from the Forge version.
2020-08-15 02:51:03 +02:00
780f68952b
Added spotless back and reformatted
2020-07-27 20:07:27 +02:00
56ecda5173
1.16 port
2020-07-27 11:21:50 +02:00
9fcfbf31be
Lots of fixes
2020-07-23 02:38:32 +02:00
1933b4b10d
Merge remote-tracking branch 'origin/master' into fabric-1.16
...
# Conflicts:
# src/main/java/appeng/block/crafting/AbstractCraftingUnitBlock.java
# src/main/java/appeng/block/qnb/QnbFormedBakedModel.java
# src/main/java/appeng/client/gui/AEBaseScreen.java
# src/main/java/appeng/client/gui/implementations/CraftAmountScreen.java
# src/main/java/appeng/client/gui/implementations/LevelEmitterScreen.java
# src/main/java/appeng/client/gui/implementations/PriorityScreen.java
# src/main/java/appeng/client/gui/widgets/NumberBox.java
# src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyModel.java
# src/main/java/appeng/client/render/cablebus/SmartCableTextures.java
# src/main/java/appeng/container/implementations/CraftingCPUContainer.java
# src/main/java/appeng/container/implementations/LevelEmitterContainer.java
# src/main/java/appeng/container/implementations/PriorityContainer.java
# src/main/java/appeng/core/AEConfig.java
# src/main/java/appeng/fluids/client/gui/FluidLevelEmitterScreen.java
# src/main/java/appeng/fluids/container/FluidLevelEmitterContainer.java
# src/main/java/appeng/me/cluster/MBCalculator.java
# src/main/java/appeng/me/cluster/implementations/CraftingCPUCalculator.java
# src/main/java/appeng/me/cluster/implementations/QuantumCalculator.java
# src/main/java/appeng/me/cluster/implementations/QuantumCluster.java
# src/main/java/appeng/me/cluster/implementations/SpatialPylonCalculator.java
# src/main/java/appeng/tile/crafting/CraftingBlockEntity.java
# src/main/java/appeng/tile/qnb/QuantumBridgeBlockEntity.java
# src/main/java/appeng/tile/spatial/SpatialPylonBlockEntity.java
2020-07-20 20:19:42 +02:00
590e435ad6
Formatting fixes
2020-07-19 23:51:57 +02:00
8d92a51e4f
Formatting fixes
2020-07-19 23:50:47 +02:00
4322910614
Added labels that specify the unit of power (AE) and the unit of fluid (mB) for the level emitters.
2020-07-19 23:50:18 +02:00
ebe589a714
Ported the other number entry dialogs over to the shared widget.
2020-07-19 23:25:11 +02:00
6187e6a7bb
Started refactoring number entry dialogs to use shared code.
2020-07-19 20:04:08 +02:00
9220ca0048
Added HWYLA
2020-07-05 16:50:39 +02:00
2642ced86b
Moving to source sets
2020-07-01 23:36:51 +02:00
80fbb58d4f
API compiles
2020-06-27 18:09:44 +02:00
b4471b1abb
The Great Renamening of 2020
2020-06-22 13:21:23 +02:00
Sebastian Hartte