[pull] master from MarvionKirito:master#1
Open
pull[bot] wants to merge 1266 commits into
Open
Conversation
awesome buggy 0.7.11 hates referencing shadows in mixin superclasses wooooooo
Merge master into 1.16.5
I saw in setup.md "(if you have docker on Windows, I'd be grateful if you could let me know if it works there too)". So I went to build it on Windows. I use Windows Subsystem for Linux, which is (mostly) Ubuntu but not really (there's no init). But Docker Desktop has an integration for WSL2. For me, gradle wouldn't build the image without forcing git to install in the container. I'll attach screenshots to the pull request. It just looks like whatever ubuntu:focal my docker system grabbed doesn't have git installed by default. Anyway, this fixes it, and shouldn't screw anything even if git is installed by default. I tested it on my M1 Mac pro and it still works fine.
…r/handleDuplicatePaletteEntries Handle duplicate palette entries
…toreBuildIgnoreExisting Restore `buildIgnoreExisting`
…ockerfile_apt Adds git to the Dockerfile apt install (Windows build functionality)
…vedVersionDetection Improve version detection
Merge 1.19.4 into 1.20.2
silence elytra chat spam
…r/fixSingleValuePalette Fix scanning chunks using a SingleValuePalette
# Conflicts: # .github/workflows/gradle_build.yml # README.md # SETUP.md # build.gradle # buildSrc/build.gradle # buildSrc/src/main/java/baritone/gradle/task/BaritoneGradleTask.java # buildSrc/src/main/java/baritone/gradle/task/ProguardTask.java # fabric/build.gradle # fabric/src/main/resources/fabric.mod.json # forge/src/main/resources/META-INF/mods.toml # gradle.properties # src/api/java/baritone/api/IBaritoneProvider.java # src/api/java/baritone/api/Settings.java # src/api/java/baritone/api/command/exception/CommandUnhandledException.java # src/api/java/baritone/api/event/listener/AbstractGameEventListener.java # src/api/java/baritone/api/schematic/MaskSchematic.java # src/api/java/baritone/api/utils/BlockOptionalMeta.java # src/api/java/baritone/api/utils/BlockOptionalMetaLookup.java # src/api/java/baritone/api/utils/Helper.java # src/api/java/baritone/api/utils/IPlayerContext.java # src/api/java/baritone/api/utils/RotationUtils.java # src/launch/java/baritone/launch/mixins/MixinClientPlayNetHandler.java # src/launch/java/baritone/launch/mixins/MixinLivingEntity.java # src/launch/java/baritone/launch/mixins/MixinMinecraft.java # src/main/java/baritone/Baritone.java # src/main/java/baritone/behavior/LookBehavior.java # src/main/java/baritone/cache/WorldProvider.java # src/main/java/baritone/command/ExampleBaritoneControl.java # src/main/java/baritone/command/defaults/ComeCommand.java # src/main/java/baritone/command/defaults/SetCommand.java # src/main/java/baritone/event/GameEventHandler.java # src/main/java/baritone/pathing/movement/Movement.java # src/main/java/baritone/pathing/movement/MovementHelper.java # src/main/java/baritone/pathing/movement/movements/MovementDescend.java # src/main/java/baritone/pathing/movement/movements/MovementPillar.java # src/main/java/baritone/process/BuilderProcess.java # src/main/java/baritone/process/FarmProcess.java # src/main/java/baritone/process/MineProcess.java # src/main/java/baritone/utils/IRenderer.java # src/main/java/baritone/utils/PathRenderer.java # src/main/java/baritone/utils/player/BaritonePlayerController.java
# Conflicts: # build.gradle # buildSrc/build.gradle # buildSrc/src/main/java/baritone/gradle/task/CreateDistTask.java # fabric/build.gradle # fabric/src/main/java/baritone/launch/FabricMixinPlugin.java # fabric/src/main/resources/fabric.mod.json # forge/build.gradle # forge/src/main/resources/META-INF/mods.toml # gradle.properties # scripts/proguard.pro # src/api/java/baritone/api/utils/RayTraceUtils.java # src/launch/java/baritone/launch/mixins/MixinClientPlayerEntity.java # src/launch/java/baritone/launch/mixins/MixinCommandSuggestionHelper.java # src/launch/java/baritone/launch/mixins/MixinMinecraft.java # src/launch/java/baritone/launch/mixins/MixinNetworkManager.java # src/main/java/baritone/behavior/InventoryBehavior.java # src/main/java/baritone/behavior/PathingBehavior.java # src/main/java/baritone/cache/CachedChunk.java # src/main/java/baritone/cache/CachedRegion.java # src/main/java/baritone/cache/CachedWorld.java # src/main/java/baritone/cache/ChunkPacker.java # src/main/java/baritone/cache/WorldScanner.java # src/main/java/baritone/command/defaults/SelCommand.java # src/main/java/baritone/pathing/movement/CalculationContext.java # src/main/java/baritone/pathing/movement/MovementHelper.java # src/main/java/baritone/pathing/movement/movements/MovementDescend.java # src/main/java/baritone/pathing/movement/movements/MovementFall.java # src/main/java/baritone/pathing/movement/movements/MovementTraverse.java # src/main/java/baritone/pathing/path/PathExecutor.java # src/main/java/baritone/process/BuilderProcess.java # src/main/java/baritone/process/MineProcess.java # src/main/java/baritone/selection/Selection.java # src/main/java/baritone/selection/SelectionRenderer.java # src/main/java/baritone/utils/InputOverrideHandler.java # src/main/java/baritone/utils/PathingControlManager.java # src/main/java/baritone/utils/ToolSet.java # src/main/java/baritone/utils/schematic/format/DefaultSchematicFormats.java # tweaker/build.gradle
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
10 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot]
Can you help keep this open source service alive? 💖 Please sponsor : )