rycbar0
7c2327b743
Merge remote-tracking branch 'origin/master' into 1.16.5
# Conflicts:
# scripts/proguard.pro
# src/launch/resources/mixins.baritone.json
# src/main/java/baritone/command/defaults/DefaultCommands.java
# src/main/java/baritone/command/defaults/FindCommand.java
# src/main/java/baritone/process/BuilderProcess.java
# src/main/java/baritone/utils/schematic/format/DefaultSchematicFormats.java
# src/main/java/baritone/utils/schematic/format/defaults/LitematicaSchematic.java
# src/main/java/baritone/utils/schematic/litematica/LitematicaHelper.java
# src/schematica_api/java/fi/dy/masa/litematica/Litematica.java
# src/schematica_api/java/fi/dy/masa/litematica/data/DataManager.java
# src/schematica_api/java/fi/dy/masa/litematica/schematic/placement/SchematicPlacement.java
# src/schematica_api/java/fi/dy/masa/litematica/schematic/placement/SchematicPlacementManager.java
# src/schematica_api/java/fi/dy/masa/litematica/schematic/placement/SchematicPlacementUnloaded.java