diff --git a/README.md b/README.md index 4a7658f..61384b0 100644 --- a/README.md +++ b/README.md @@ -6,20 +6,19 @@ [**πŸ“„ Included mods**](./docs/mods.md) ## Installation -We recommend using the [PolyMC launcher](https://polymc.org/) for playing the pack. +We recommend using the [Prism launcher](https://prismlauncher.org/) for playing the pack. While creating a new instance, you can select the pack after searching for it in the _Modrinth_ tab. ### Additional recommendations -- [`Terralith`](https://www.planetminecraft.com/data-pack/terralith-overworld-evolved-100-biomes-caves-and-more/) β€” Datapack adding many new biomes -- [`Complementary Shaders`](https://www.curseforge.com/minecraft/customization/complementary-shaders) β€” Highly-configurable shader-pack +- [`Complementary Shaders`](https://www.curseforge.com/minecraft/customization/complementary-shaders) β€” highly-configurable shader-pack ## Notable changes -- Click an item frame with an amethyst shard to make it invisible +- Clicking an item frame with an amethyst shard makes it invisible - Witches drop Luck potions - Snow accumulates in cold biomes - A crafting table can be used from the inventory -- Crops can't be trampled +- Crops can’t be trampled - Bats can be caught in buckets and let nearby entities glow for 20s when they are released - Enchantment books and potions are stackable (16) - Spyglass zooming can be adjusted by scrolling and there is a keybind for using it diff --git a/docs/mods.md b/docs/mods.md index e8ffc6e..21e7a7c 100644 --- a/docs/mods.md +++ b/docs/mods.md @@ -41,7 +41,7 @@ The [`Better Leaves` resource-pack by MidnightDust](https://github.com/TeamMidni ### GUI - `AppleSkin` β€” hunger/health-related HUD improvements -- `Here be no Dragons!` β€” Disables the *experimental world settings* warning +- `Here be no Dragons!` β€” disables the *experimental world settings* warning - `JourneyMap` β€” HUD map - `Mod Menu` β€” adds a mod menu - `Paginated Advancements` β€” improved advancements screen diff --git a/src/client/one-time-overrides/journeymap/config/5.9/addons/addon.fwaystones.config b/src/client/one-time-overrides/journeymap/config/5.9/addons/addon.fwaystones.config new file mode 100644 index 0000000..b6e653a --- /dev/null +++ b/src/client/one-time-overrides/journeymap/config/5.9/addons/addon.fwaystones.config @@ -0,0 +1,17 @@ +// jm.config.file_header_1 +// jm.config.file_header_2 +// jm.config.file_header_5 +{ + "name": "fwaystones", + "fields": { + "displayed": { + "value": "true", + "type": "BooleanField" + }, + "enabled": { + "value": "true", + "type": "BooleanField" + } + }, + "configVersion": "5.9.0beta3" +} \ No newline at end of file diff --git a/src/client/one-time-overrides/journeymap/config/5.8/journeymap.core.config b/src/client/one-time-overrides/journeymap/config/5.9/journeymap.core.config similarity index 91% rename from src/client/one-time-overrides/journeymap/config/5.8/journeymap.core.config rename to src/client/one-time-overrides/journeymap/config/5.9/journeymap.core.config index 225a1e7..9285ef5 100644 --- a/src/client/one-time-overrides/journeymap/config/5.8/journeymap.core.config +++ b/src/client/one-time-overrides/journeymap/config/5.9/journeymap.core.config @@ -12,7 +12,7 @@ "announceMod": "false", "checkUpdates": "false", "recordCacheStats": "false", - "themeName": "Purist", + "themeName": "OceanMonument", "caveIgnoreGlass": "true", "mapBathymetry": "false", "mapWaterBiomeColors": "false", @@ -28,6 +28,7 @@ "mapBlendFoliage": "true", "mapBlendWater": "false", "mapSurfaceAboveCaves": "true", + "caveBlackAsClear": "false", "renderDistanceCaveMax": "0", "renderDistanceSurfaceMax": "0", "renderDelay": "2", @@ -48,8 +49,8 @@ "glErrorChecking": "false", "seedId": "false", "mappingEnabled": "true", - "optionsManagerViewed": "5.8.5", - "splashViewed": "5.8.5", + "optionsManagerViewed": "5.9.0beta3", + "splashViewed": "5.9.0beta3", "gridSpecs": { "day": "Squares,#808080,0.5,-1,-1", "night": "Squares,#8080ff,0.3,-1,-1", @@ -62,5 +63,5 @@ "colorPlayer": "#ffffff", "colorSelf": "#0000ff", "verboseColorPalette": "false", - "configVersion": "5.8.5" -} + "configVersion": "5.9.0beta3" +} \ No newline at end of file diff --git a/src/client/one-time-overrides/journeymap/config/5.8/journeymap.fullmap.config b/src/client/one-time-overrides/journeymap/config/5.9/journeymap.fullmap.config similarity index 76% rename from src/client/one-time-overrides/journeymap/config/5.8/journeymap.fullmap.config rename to src/client/one-time-overrides/journeymap/config/5.9/journeymap.fullmap.config index 9b0d191..99ebbbe 100644 --- a/src/client/one-time-overrides/journeymap/config/5.8/journeymap.fullmap.config +++ b/src/client/one-time-overrides/journeymap/config/5.9/journeymap.fullmap.config @@ -2,7 +2,7 @@ // jm.config.file_header_2 // jm.config.file_header_5 { - "showKeys": "false", + "showKeys": "true", "showPlayerLoc": "true", "showMouseLoc": "true", "dragScale": "1", @@ -12,24 +12,24 @@ "showPlayerHeading": "false", "mobDisplay": "LargeDots", "mobDisplayScale": "1.0", - "showMobHeading": "true", + "showMobHeading": "false", "showMobs": "false", "showAnimals": "false", "showVillagers": "false", - "showPets": "false", + "showPets": "true", "showPlayers": "false", "fontScale": "1.0", "showWaypointLabels": "true", "waypointLabelScale": "1.0", "waypointIconScale": "1.0", - "locationFormatVerbose": "false", + "locationFormatVerbose": "true", "locationFormat": "xzyv", "showWaypoints": "true", "showSelf": "true", "showGrid": "true", - "showCaves": "true", + "showCaves": "false", "showEntityNames": "false", - "preferredMapType": "night", - "zoomLevel": "0", - "configVersion": "5.8.5" + "preferredMapType": "day", + "zoomLevel": "2", + "configVersion": "5.9.0beta3" } \ No newline at end of file diff --git a/src/client/one-time-overrides/journeymap/config/5.8/journeymap.minimap.config b/src/client/one-time-overrides/journeymap/config/5.9/journeymap.minimap.config similarity index 75% rename from src/client/one-time-overrides/journeymap/config/5.8/journeymap.minimap.config rename to src/client/one-time-overrides/journeymap/config/5.9/journeymap.minimap.config index 9a66f69..ad4151d 100644 --- a/src/client/one-time-overrides/journeymap/config/5.8/journeymap.minimap.config +++ b/src/client/one-time-overrides/journeymap/config/5.9/journeymap.minimap.config @@ -8,9 +8,9 @@ "shape": "Circle", "showDayNight": "true", "info1Label": "jm.theme.labelsource.blank", - "info2Label": "jm.theme.labelsource.blank", - "info3Label": "jm.theme.labelsource.blank", - "info4Label": "jm.theme.labelsource.blank", + "info2Label": "jm.theme.labelsource.gametime", + "info3Label": "jm.theme.labelsource.location", + "info4Label": "jm.theme.labelsource.biome", "infoSlotAlpha": "0.7", "positionX": "0.9", "positionY": "0.25", @@ -19,12 +19,12 @@ "terrainAlpha": "100", "backgroundAlpha": "0.8", "orientation": "North", - "compassFontScale": "1.13", + "compassFontScale": "1.0", "showCompass": "false", - "showReticle": "true", + "showReticle": "false", "reticleOrientation": "Compass", "moveEffectIcons": "true", - "effectTranslateX": "-913", + "effectTranslateX": "-1369", "effectTranslateY": "0", "effectVertical": "false", "effectReversed": "false", @@ -41,9 +41,9 @@ "showMobs": "false", "showAnimals": "false", "showVillagers": "false", - "showPets": "false", + "showPets": "true", "showPlayers": "false", - "fontScale": "1.5", + "fontScale": "1.0", "showWaypointLabels": "true", "waypointLabelScale": "1.0", "waypointIconScale": "1.0", @@ -51,10 +51,10 @@ "locationFormat": "xzyv", "showWaypoints": "true", "showSelf": "true", - "showGrid": "true", - "showCaves": "true", - "showEntityNames": "false", - "preferredMapType": "night", + "showGrid": "false", + "showCaves": "false", + "showEntityNames": "true", + "preferredMapType": "day", "zoomLevel": "0", - "configVersion": "5.8.5" + "configVersion": "5.9.0beta3" } \ No newline at end of file diff --git a/src/client/one-time-overrides/journeymap/config/5.8/journeymap.minimap2.config b/src/client/one-time-overrides/journeymap/config/5.9/journeymap.minimap2.config similarity index 96% rename from src/client/one-time-overrides/journeymap/config/5.8/journeymap.minimap2.config rename to src/client/one-time-overrides/journeymap/config/5.9/journeymap.minimap2.config index ab96092..8008712 100644 --- a/src/client/one-time-overrides/journeymap/config/5.8/journeymap.minimap2.config +++ b/src/client/one-time-overrides/journeymap/config/5.9/journeymap.minimap2.config @@ -51,10 +51,10 @@ "locationFormat": "xzyv", "showWaypoints": "true", "showSelf": "true", - "showGrid": "true", + "showGrid": "false", "showCaves": "true", "showEntityNames": "true", "preferredMapType": "day", "zoomLevel": "0", - "configVersion": "5.8.5" + "configVersion": "5.9.0beta3" } \ No newline at end of file diff --git a/src/client/one-time-overrides/journeymap/config/5.9/journeymap.topo.config b/src/client/one-time-overrides/journeymap/config/5.9/journeymap.topo.config new file mode 100644 index 0000000..ce2600f --- /dev/null +++ b/src/client/one-time-overrides/journeymap/config/5.9/journeymap.topo.config @@ -0,0 +1,10 @@ +// jm.config.file_header_1 +// jm.config.file_header_5 +{ + "showContour": "true", + "landContour": "#3F250B", + "waterContour": "#0000dd", + "land": "#010c02,#041105,#071609,#0a1b0c,#0d200f,#102513,#132a16,#162f19,#19341c,#1b3a20,#1e3f23,#214426,#24492a,#274e2d,#2a5330,#2d5834,#375f41,#41674d,#4b6e5a,#557567,#5f7c73,#698480,#738b8d,#7c929a,#8699a6,#90a1b3,#9aa8c0,#a4afcc,#aeb6d9,#b8bee6,#c2c5f2,#ccccff,#cccfff,#ccd2ff,#ccd6ff,#ccd9ff,#ccdcff,#ccdfff,#cce2ff,#cce5ff,#cce9ff,#ccecff,#ccefff,#ccf2ff,#ccf5ff,#ccf9ff,#ccfcff,#ccffff,#cfffff,#d2ffff,#d6ffff,#d9ffff,#dcffff,#dfffff,#e2ffff,#e5ffff,#e9ffff,#ecffff,#efffff,#f2ffff,#f5ffff,#f9ffff,#fcffff,#ffffff", + "water": "#000040,#02024e,#03035d,#05056b,#070779,#080887,#0a0a96,#0b0ba4,#1a1aaa,#2a2aaf,#3939b5,#4848bb,#5757c0,#6767c6,#7676cc,#8585d2,#9494d7,#a4a4dd,#b3b3e3,#c2c2e8,#d1d1ee,#d7d7f0,#ddddf2,#e2e2f4,#e8e8f6,#eeeef9,#f4f4fb,#f9f9ff,#f9f9ff,#f9f9ff,#f9f9ff,#f9f9ff", + "configVersion": "5.9.0beta3" +} \ No newline at end of file diff --git a/src/client/one-time-overrides/journeymap/config/5.9/journeymap.waypoint.config b/src/client/one-time-overrides/journeymap/config/5.9/journeymap.waypoint.config new file mode 100644 index 0000000..a4c9d51 --- /dev/null +++ b/src/client/one-time-overrides/journeymap/config/5.9/journeymap.waypoint.config @@ -0,0 +1,32 @@ +// jm.config.file_header_1 +// jm.config.file_header_2 +// jm.config.file_header_5 +{ + "managerEnabled": "true", + "beaconEnabled": "true", + "showTexture": "true", + "showStaticBeam": "true", + "showRotatingBeam": "true", + "showName": "true", + "showDistance": "true", + "autoHideLabel": "true", + "showDeviationLabel": "false", + "disableStrikeThrough": "false", + "boldLabel": "false", + "fontScale": "2.0", + "textureSmall": "true", + "shaderBeacon": "false", + "maxDistance": "0", + "minDistance": "4", + "createDeathpoints": "true", + "autoRemoveDeathpoints": "false", + "autoRemoveDeathpointDistance": "2", + "autoRemoveTempWaypoints": "2", + "showDeathpointlabel": "true", + "fullscreenDoubleClickToCreate": "true", + "teleportCommand": "/tp {name} {x} {y} {z}", + "dateFormat": "MM-dd-yyyy", + "timeFormat": "HH:mm:ss", + "managerDimensionFocus": "false", + "configVersion": "5.9.0beta3" +} \ No newline at end of file diff --git a/src/client/one-time-overrides/journeymap/config/5.9/journeymap.webmap.config b/src/client/one-time-overrides/journeymap/config/5.9/journeymap.webmap.config new file mode 100644 index 0000000..ffd4450 --- /dev/null +++ b/src/client/one-time-overrides/journeymap/config/5.9/journeymap.webmap.config @@ -0,0 +1,8 @@ +// jm.config.file_header_1 +// jm.config.file_header_2 +// jm.config.file_header_5 +{ + "enabled": "false", + "port": "8080", + "configVersion": "5.9.0beta3" +} \ No newline at end of file diff --git a/src/server/journeymap/server/5.8/journeymap.server.global.config b/src/server/journeymap/server/5.9/journeymap.server.global.config similarity index 84% rename from src/server/journeymap/server/5.8/journeymap.server.global.config rename to src/server/journeymap/server/5.9/journeymap.server.global.config index 93c88fb..ed7f984 100644 --- a/src/server/journeymap/server/5.8/journeymap.server.global.config +++ b/src/server/journeymap/server/5.9/journeymap.server.global.config @@ -6,13 +6,13 @@ { "journeymapEnabled": "true", "useWorldId": "true", - "viewOnlyServerProperties": "false", - "allowMultiplayerSettings": "ALL", - "worldPlayerRadar": "NONE", + "viewOnlyServerProperties": "true", + "allowMultiplayerSettings": "OPS", + "worldPlayerRadar": "ALL", "worldPlayerRadarUpdateTime": "5", "seeUndergroundPlayers": "NONE", "hideOps": "false", - "hideSpectators": "false", + "hideSpectators": "true", "allowDeathPoints": "true", "showInGameBeacons": "true", "allowWaypoints": "true", @@ -27,5 +27,5 @@ "villagerRadarEnabled": "false", "animalRadarEnabled": "false", "mobRadarEnabled": "false", - "configVersion": "5.8.5" + "configVersion": "5.9.0beta3" } \ No newline at end of file diff --git a/src/universal/mods/light-overlay.hm.json b/src/universal/mods/light-overlay.hm.json index bdd2a0c..c4273ce 100644 --- a/src/universal/mods/light-overlay.hm.json +++ b/src/universal/mods/light-overlay.hm.json @@ -1,7 +1,6 @@ { "formatVersion": 1, - "enabled": false, - "comment": "Does not work and the repository is inactive.", + "enabled": true, "version": { "name": "7.0.0+fabric", "size": 62616,