Commit Graph

3386 Commits

Author SHA1 Message Date
ZacSharp b2f66241d5
Merge remote-tracking branch 'upstream/master' into pr/frostwalker 2022-12-30 15:57:17 +01:00
leijurv cfdbc851a0
Merge pull request #3600 from Imeguras/master
Added the ability to use KmM as abreviatures
2022-12-24 00:14:04 -08:00
leijurv 6ccebdc978
Merge pull request #3703 from rycbar0/master
formula error
2022-12-24 00:12:47 -08:00
leijurv df53040339
Merge pull request #3757 from Warpten/feature/paths-with-spaces-are-stupid
Improve handling spaces in paths during proguard pass
2022-12-24 00:08:04 -08:00
leijurv 42dc5b14b0
Merge pull request #3755 from wagyourtail/allowbreakanaywaymine
allowBreakAnyway should let mining happen
2022-12-24 00:07:00 -08:00
leijurv e2538abcb1
Merge pull request #3743 from ZacSharp/patch-11
Fix Registry.unregister
2022-12-24 00:05:42 -08:00
leijurv 1697293f12
Merge pull request #3479 from scorbett123/caching_performance_upgrade
Caching performance upgrade
2022-12-23 23:57:14 -08:00
rycbar0 d60e1e8a05
Merge branch 'cabaletta:master' into master 2022-12-19 10:34:57 +01:00
Warpten d157756d94
Improve handling spaces in paths during proguard pass 2022-12-12 01:08:49 +01:00
Wagyourtail ea1914a248
missed a spot 2022-12-10 20:12:51 -07:00
Wagyourtail 85087ce04a
smarter filter filtering 2022-12-10 19:25:57 -07:00
Wagyourtail e09127eadf
allowBreakAnyway should let mining happen 2022-12-10 16:35:51 -07:00
ZacSharp e1095962a1
Fix Registry.unregister 2022-11-28 23:07:30 +01:00
ZacSharp eabd1150b0
Allow breaking next to some liquids 2022-11-22 15:15:33 +01:00
Leijurv 93501248cd
Merge pull request #3698 from ZacSharp/patch-10
Reliably clear keys when paused
2022-10-31 12:29:56 -07:00
Leijurv 3a945c8c10
Merge pull request #3697 from ZacSharp/pr/buildIgnoreProperties
 Add buildIgnoreProperties setting
2022-10-31 12:28:44 -07:00
rycbar0 3cef7a7911 formula error 2022-10-26 23:09:23 +02:00
ZacSharp 1cd2fb5b18
Reliably clear keys when paused 2022-10-24 22:49:12 +02:00
ZacSharp ba3ca47f8c
Add buildIgnoreProperties setting 2022-10-23 01:42:31 +02:00
Leijurv 2453a4a4f1
Merge pull request #3458 from ZacSharp/1.17.1-update
Merge 1.16.5 into 1.17.1
2022-10-11 14:12:58 -07:00
ZacSharp 5a8adc5344
Merge branch '1.16.5' into 1.17.1 2022-10-06 20:43:01 +02:00
Leijurv c1e12b8746
Merge pull request #3678 from rycbar0/1.16.5
Merging Master in 1.16.5
2022-10-04 13:02:41 -07:00
rycbar0 44c1438541 forgot to adjust version check 2022-10-04 19:38:16 +02:00
rycbar0 c2a857f4d6 merging main into 1.16.5 2022-10-04 03:41:38 +02:00
rycbar0 9d620f8137 merging main into 1.16.5 2022-10-04 03:35:49 +02:00
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
2022-10-04 03:18:30 +02:00
rycbar0 d91abd5e45 Litematica support for 1.16.5 2022-10-04 02:09:07 +02:00
scorbett123 4699b46744
Merge branch 'master' into caching_performance_upgrade 2022-10-03 21:25:23 +01:00
Leijurv 69ffdb7665
Merge pull request #3672 from rycbar0/master
Litematica Support for bariton
2022-10-03 12:52:18 -07:00
rycbar0 f9c5386e7a final changes 2022-10-03 21:39:53 +02:00
Leijurv 55273b5340
Merge pull request #3579 from lucasarden/master
Stop backfill from filling while paused
2022-10-03 12:23:02 -07:00
Leijurv 04f5ca2647
Merge pull request #3642 from wagyourtail/1.16.5/removeschematica
remove schematica command because it doesn't work anyway on 1.13+
2022-10-03 12:21:38 -07:00
rycbar0 5cd1c9d15d
Merge pull request #1 from rycbar0/LitematicaCommand
Adding a Litematica command to build loaded schematics.
2022-10-03 20:39:24 +02:00
rycbar0 b461b2af2f made a oopsie 2022-10-03 20:32:56 +02:00
rycbar0 3a5608566e auto formatting 2022-10-03 20:13:11 +02:00
rycbar0 fc65f22feb clean up and adding javadoc 2022-10-03 19:59:07 +02:00
rycbar0 f53bfa89a9 a fucking x and z mixup 2022-10-03 17:44:15 +02:00
rycbar0 fdfeeb2ffa need stronger pesticides, bugs keep multiplying 2022-10-03 02:35:25 +02:00
rycbar0 3e75cc7408 block mirroring and rotation 2022-10-01 22:59:47 +02:00
rycbar0 d1930e03e1 getCorrectedOrigin returns the correct origin 2022-10-01 22:51:36 +02:00
rycbar0 144a534bb3 debugging mirroring and rotating as well as refactoring 2022-10-01 17:14:05 +02:00
rycbar0 de1256cc80 remove spaghetti 2022-10-01 05:27:02 +02:00
rycbar0 76404c8af6 it works but its spaghetti 2022-10-01 02:01:46 +02:00
ZacSharp fb814e912d
Don't try parkouring out of water 2022-09-30 23:59:49 +02:00
ZacSharp 43ee86b4fe
Don't try backplacing against water under carpet/lilypad 2022-09-30 22:41:09 +02:00
ZacSharp eb697b7a17
Fix costs when assumeWalkOnWater stops us from relying on frostWalker 2022-09-30 22:40:23 +02:00
ZacSharp 3da5bbd267
Don't pillar from carpet/lilypad on water 2022-09-30 22:38:21 +02:00
ZacSharp c14be17e53
Move this to a helper method and add missing cases 2022-09-30 22:27:32 +02:00
ZacSharp 45c0b38156
Fix jumping from packplaced blocks on water
Not having frostwalker means that we must have replaced the water with a throwaway, not that we are standing on water
2022-09-30 18:04:34 +02:00
rycbar0 025f6235f9 litematica command works and added schematic selection if more than 1 schematic is loaded
bug: if schematic origin isnt minimum corner schematic is built in the wrong place
2022-09-30 17:53:31 +02:00