-
-
Notifications
You must be signed in to change notification settings - Fork 94
Merge dev/1.19.2 into dev/1.20.1 #626
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
# Conflicts: # gradle.properties # src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e # src/main/java/de/srendi/advancedperipherals/AdvancedPeripherals.java # src/main/java/de/srendi/advancedperipherals/common/data/RecipesProvider.java
Checking the distance does work for the upper direction of the block The key elements are mising - Height mode - Mode for transparent blocks - Mode for entities - Laser visibility - direction of the block
# Conflicts: # gradle.properties # src/main/java/de/srendi/advancedperipherals/AdvancedPeripherals.java # src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/ARControllerPeripheral.java # src/main/java/de/srendi/advancedperipherals/common/addons/mekanism/EnvironmentRadiationPlugin.java # src/main/java/de/srendi/advancedperipherals/common/data/BlockLootTables.java # src/main/java/de/srendi/advancedperipherals/common/data/DataGenerators.java # src/main/java/de/srendi/advancedperipherals/common/data/EnUsLanguageProvider.java # src/main/java/de/srendi/advancedperipherals/common/data/PoiTypeProvider.java # src/main/java/de/srendi/advancedperipherals/common/data/RecipesProvider.java # src/main/java/de/srendi/advancedperipherals/common/data/TurtleUpgradesProvider.java # src/main/java/de/srendi/advancedperipherals/common/items/ARGogglesItem.java # src/main/java/de/srendi/advancedperipherals/common/setup/BlockEntityTypes.java # src/main/java/de/srendi/advancedperipherals/common/setup/Blocks.java # src/main/java/de/srendi/advancedperipherals/common/setup/Items.java # src/main/java/de/srendi/advancedperipherals/common/setup/Villagers.java # src/main/java/de/srendi/advancedperipherals/common/village/VillagerTrades.java # src/main/java/de/srendi/advancedperipherals/network/messages/UpdateHudCanvasMessage.java
…tions with the same names. This makes it easier to support both in the same script Still needs some adjustments and documentation
# Conflicts: # gradle.properties # src/main/java/de/srendi/advancedperipherals/APCreativeTab.java # src/main/java/de/srendi/advancedperipherals/AdvancedPeripherals.java # src/main/java/de/srendi/advancedperipherals/common/addons/APAddons.java # src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/MeBridgePeripheral.java # src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/RsBridgePeripheral.java # src/main/java/de/srendi/advancedperipherals/common/blocks/blockentities/ChatBoxEntity.java # src/main/java/de/srendi/advancedperipherals/common/blocks/blockentities/EnergyDetectorEntity.java # src/main/java/de/srendi/advancedperipherals/common/blocks/blockentities/RedstoneIntegratorEntity.java # src/main/java/de/srendi/advancedperipherals/common/data/RecipesProvider.java # src/main/java/de/srendi/advancedperipherals/common/items/ARGogglesItem.java # src/main/java/de/srendi/advancedperipherals/common/setup/BlockEntityTypes.java # src/main/java/de/srendi/advancedperipherals/common/village/VillagerTrades.java
# Conflicts: # gradle.properties # src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e # src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 # src/main/java/de/srendi/advancedperipherals/AdvancedPeripherals.java # src/main/java/de/srendi/advancedperipherals/common/data/RecipesProvider.java
…rt glasses as item and the computer with a terminal behind it. A custom API and a `flat.lua` file in the rom do exist too
# Conflicts: # src/generated/resources/.cache/2db41954e490230d51b10affff25ee2ee27b8d5b # src/generated/resources/.cache/5a761efb7472ef97566e41e81451930a004134bf # src/generated/resources/.cache/67cce32b1c3cbbcb1f646605f4914e3f196986c2 # src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e # src/generated/resources/.cache/ae219fa7c7d3297c14e454863eac3998a4eab78c # src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 # src/generated/resources/.cache/f95c7003282837dabaa33e3ffceec4e6865b5218 # src/generated/resources/data/advancedperipherals/advancements/recipes/advancedperipheralstab/armor/smart_glasses_netherite.json # src/generated/resources/data/advancedperipherals/advancements/recipes/advancedperipheralstab/smart_glasses.json # src/generated/resources/data/advancedperipherals/recipes/colony_integrator.json
fix playNote will not trigger alley
Signed-off-by: Kevin Z <[email protected]>
[Feature] add advanced place method to automata core when compass peripheral is equipped
fix player can bypass the maximum chatbox/playerdetector range by setting a negative range
Continue to fix chatbox range, forgot to remove a Math.min
Conflicts: .github/ISSUE_TEMPLATE/bug_report.yml src/main/java/de/srendi/advancedperipherals/common/addons/botania/ManaFlowerIntegration.java src/main/java/de/srendi/advancedperipherals/common/util/fakeplayer/APFakePlayer.java src/main/java/de/srendi/advancedperipherals/common/util/fakeplayer/FakePlayerProviderTurtle.java
|
horrible 187 commits included dev/0.8 because of my last mis-merge which is reverted :( |
Also my fault because I didn't see that ;D |
|
In general, I agree, linking the issues with a PR. But we follow the convention that we only close the issues after we released a fix for it. Or else, they're not fixed in production |
Ah ye, you know github will automatically close issue when something commited to the default branch |
getTransferRate()- gas detectorgetRadiationto the environment detectorflat.luafile in the rom do exist tooAPAddonswasn't initializedDEVfrom the version since our pipeline does handle this automaticallyto/fromPeripheralfunctions and add the logic for peripheral based storages directly to theimpportandexportfunctions Needs to be documentedusedBytesandtotalBytesfield to the drive's objectgetCraftingTasksandcancelCraftingTaskscancelCraftingTasksto the ME BridgeglassesKeyPressedevent!onUnequippedfunction to the IModule interface Switch to a slot based module system to better track module changescancelCraftingTasksfor the ME Bridgeslotinfo forinventoryManager.getItemInHandAdvanced-Peripherals-Features#67isOnEnchantedSoil()for the mana flower integrationPLEASE READ THE GUIDELINES BEFORE MAKING A CONTRIBUTION