Merge branch 'main' into update-version

RyanLua · Jun 18, 2024 · d450317 · d450317
2 parents c6e1036 + 4bcaa21
commit d450317
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -154,7 +154,7 @@ Satchel supports instance attributes allowing you to change and customize many a
 | CornerRadius: [`UDim`](https://create.roblox.com/docs/reference/engine/datatypes/UDim) | Determines the radius, in pixels, of the default inventory window and slots. | `0, 8` |
 | EquipBorderColor3: [`Color3`](https://create.roblox.com/docs/reference/engine/datatypes/Color3) | Determines the color of the equip border when a slot is equipped. | `[255, 255, 255]` |
 | EquipBorderSizePixel: [`number`](https://create.roblox.com/docs/scripting/luau/numbers) | Determines the pixel width of the equip border when a slot is equipped. | `5` |
-| FontFace: [`Font`](https://create.roblox.com/docs/reference/engine/enums/Font) | Determines the font of the default inventory window and slots. | `Gotham SSm` |
+| FontFace: [`Font`](https://create.roblox.com/docs/reference/engine/enums/Font) | Determines the font of the default inventory window and slots. | `Builder Sans` |
 | InsetIconPadding: [`boolean`](https://create.roblox.com/docs/scripting/luau/booleans) | Determines whether or not the tool icon is padded in the default inventory window and slots. | True |
 | OutlineEquipBorder: [`boolean`](https://create.roblox.com/docs/scripting/luau/booleans) | Determines whether or not the equip border is outline or inset when a slot is equipped. | True |
 | TextColor3: [`Color3`](https://create.roblox.com/docs/reference/engine/datatypes/Color3) | Determines the color of the text in default inventory window and slots. | `[255, 255, 255]` |

diff --git a/docs/api-reference.md b/docs/api-reference.md
@@ -63,7 +63,7 @@ end)
 | CornerRadius: [`UDim`](https://create.roblox.com/docs/reference/engine/datatypes/UDim) | Determines the radius, in pixels, of the default inventory window and slots. | `0, 8` |
 | EquipBorderColor3: [`Color3`](https://create.roblox.com/docs/reference/engine/datatypes/Color3) | Determines the color of the equip border when a slot is equipped. | `[255, 255, 255]` |
 | EquipBorderSizePixel: [`number`](https://create.roblox.com/docs/scripting/luau/numbers) | Determines the pixel width of the equip border when a slot is equipped. | `5` |
-| FontFace: [`Font`](https://create.roblox.com/docs/reference/engine/enums/Font) | Determines the font of the default inventory window and slots. | `Gotham SSm` |
+| FontFace: [`Font`](https://create.roblox.com/docs/reference/engine/enums/Font) | Determines the font of the default inventory window and slots. | `Builder Sans` |
 | InsetIconPadding: [`boolean`](https://create.roblox.com/docs/scripting/luau/booleans) | Determines whether or not the tool icon is padded in the default inventory window and slots. | True |
 | OutlineEquipBorder: [`boolean`](https://create.roblox.com/docs/scripting/luau/booleans) | Determines whether or not the equip border is outline or inset when a slot is equipped. | True |
 | TextColor3: [`Color3`](https://create.roblox.com/docs/reference/engine/datatypes/Color3) | Determines the color of the text in default inventory window and slots. | `[255, 255, 255]` |

diff --git a/src/init.luau b/src/init.luau
@@ -122,8 +122,9 @@ local SEARCH_BUFFER_PIXELS: number = 5
 local SEARCH_WIDTH_PIXELS: number = 200
 
 -- Misc
-local FONT_FAMILY: Font = targetScript:GetAttribute("FontFace") or Font.new("rbxasset://fonts/families/GothamSSm.json")
-local FONT_SIZE: number = targetScript:GetAttribute("TextSize") or 14
+local FONT_FAMILY: Font = targetScript:GetAttribute("FontFace")
+	or Font.new("rbxasset://fonts/families/BuilderSans.json")
+local FONT_SIZE: number = targetScript:GetAttribute("TextSize") or 16
 local DROP_HOTKEY_VALUE: number = Enum.KeyCode.Backspace.Value
 local ZERO_KEY_VALUE: number = Enum.KeyCode.Zero.Value
 local DOUBLE_CLICK_TIME: number = 0.5

diff --git a/src/init.meta.json b/src/init.meta.json
@@ -18,7 +18,7 @@
       },
       "FontFace": {
         "Font": {
-          "family": "rbxasset://fonts/families/GothamSSm.json",
+          "family": "rbxasset://fonts/families/BuilderSans.json",
           "weight": "Regular",
           "style": "Normal"
         }
@@ -33,7 +33,7 @@
         "Color3": [1, 1, 1]
       },
       "TextSize": {
-        "Float32": 14
+        "Float32": 16
       },
       "TextStrokeColor3": {
         "Color3": [0, 0, 0]

diff --git a/test.project.json b/test.project.json
@@ -10,7 +10,7 @@
         "$className": "StarterPlayerScripts",
 
         "Test": {
-          "$path": "tests/Test.client.lua",
+          "$path": "tests/Test.client.luau",
 
           "Satchel": {
             "$path": "src"