Commit Graph

28 Commits

Author SHA1 Message Date
ZacSharp 327fbc868e
Merge branch '1.16.5' into 1.17.1 2023-01-29 01:25:17 +01:00
ZacSharp d3e0da7c5e
Merge branch '1.15.2' into 1.16.5 2023-01-27 22:36:53 +01:00
ZacSharp 25ef38aaf2
Merge branch '1.13.2' into 1.14.4 2023-01-27 22:30:51 +01:00
ZacSharp d05d5fd98e
Merge branch 'master' into 1.13.2 2023-01-27 22:20:20 +01:00
ZacSharp 432d42ade8
Fix #find results not being clickable 2023-01-15 20:22:58 +01:00
Leijurv d6d9af65fb
reformat 2023-01-15 01:04:15 -08:00
ZacSharp 9b3e5cb444
Merge branch '1.13.2' into 1.14.4 2023-01-10 01:26:48 +01:00
ZacSharp b51b78f4e4
Merge branch 'master' into 1.13.2 2023-01-06 01:47:30 +01:00
ZacSharp 5a8adc5344
Merge branch '1.16.5' into 1.17.1 2022-10-06 20:43:01 +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
ZacSharp 59b3fe7c3a
Merge branch '1.16.5' into 1.17.1 2022-06-03 19:05:47 +02:00
ZacSharp 1522d11df0
Merge branch '1.13.2' into 1.14.4 2022-03-21 23:15:22 +01:00
ZacSharp 7eecf69178
Merge branch 'master' into 1.13.2 2022-03-21 17:57:39 +01:00
ZacSharp ef4e19002b
Provide more information for #find
Always log something to chat so people don't think it's broken and make sure they know about the restriction to cached blocks.
2022-03-05 22:27:27 +01:00
ZacSharp e6ee5fc6b8
Make positions from #find clickable 2022-03-05 21:42:27 +01:00
ehylo 0ade37f14f
Update Setup and Usage guides
Also fix 2 settings that just don't have a description for some reason, and add some information to the find command because that also for some reason did not have anything there. The descriptions I put may not be detailed enough so please let me know if things should change
2022-02-08 21:13:51 -08:00
wagyourtail e6d8b268c7
migrate to mojmap 2021-07-07 15:43:48 -06:00
Leijurv 5262f68215
a long overdue reformat of every file 2021-01-29 20:30:51 -08:00
Leijurv 37cd50d435
a long overdue reformat of every file 2021-01-29 20:28:11 -08:00
Leijurv 15fd313757
a long overdue reformat of every file 2021-01-29 20:26:06 -08:00
Leijurv 835fb3471f
a long overdue reformat of every file 2021-01-29 20:17:53 -08:00
Leijurv 2b3a302a5f
Merge branch '1.13.2' into 1.14.4 2019-10-11 17:04:53 -07:00
Leijurv dc7d64fb88
Merge commit 'ce2fc6f2514245987659b378687f795ab641cf1e' into 1.13.2 2019-10-09 20:44:22 -07:00
Brady 9591b6fdef
Move IArgConsumer from *.helpers.arguments to *.argument 2019-10-07 10:00:04 -05:00
Leijurv e54d63576f
Merge branch '1.13.2' into 1.14.4 2019-10-06 17:02:41 -07:00
Leijurv 9c323aba91
Merge branch 'master' into 1.13.2 2019-10-06 15:51:27 -07:00
Brady 889e288524
Refactor *.util.command to *.command 2019-10-06 15:21:21 -05:00