Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: ox_lib update to version 3.9.1 #504

Merged
merged 2 commits into from
Sep 6, 2023
Merged

chore: ox_lib update to version 3.9.1 #504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc947d7
chore: ox_lib update to version 3.9.1
bitpredator Sep 6, 2023
6e73139
Merge branch 'develop' of https://github.com/bitpredator/empiretown i…
bitpredator Sep 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion server-data/resources/[ox]/ox_lib/fxmanifest.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ rdr3_warning 'I acknowledge that this is a prerelease build of RedM, and I am aw
--[[ Resource Information ]]--
name 'ox_lib'
author 'Overextended'
version '3.9.0'
version '3.9.1'
license 'LGPL-3.0-or-later'
repository 'https://github.com/overextended/ox_lib'
description 'A library of shared functions to utilise in other resources.'
Expand Down
7 changes: 6 additions & 1 deletion server-data/resources/[ox]/ox_lib/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,12 @@ if not _VERSION:find('5.4') then
error('^1Lua 5.4 must be enabled in the resource manifest!^0', 2)
end

local resourceName = GetCurrentResourceName()
local ox_lib = 'ox_lib'

-- Some people have decided to load this file as part of ox_lib's fxmanifest?
if resourceName == ox_lib then return end

local export = exports[ox_lib]

if GetResourceState(ox_lib) ~= 'started' then
Expand Down Expand Up @@ -162,7 +167,7 @@ end
---Caches the result of a function, optionally clearing it after timeout ms.
function cache(key, func, timeout) end

cache = setmetatable({ game = GetGameName(), resource = GetCurrentResourceName() }, {
cache = setmetatable({ game = GetGameName(), resource = resourceName }, {
__index = context == 'client' and function(self, key)
AddEventHandler(('ox_lib:cache:%s'):format(key), function(value)
self[key] = value
Expand Down
10 changes: 5 additions & 5 deletions server-data/resources/[ox]/ox_lib/locales/es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
"confirm": "Confirmar",
"more": "Más..."
},
"txadmin_announcement": "Server announcement by %s",
"txadmin_dm": "Direct Message from %s",
"txadmin_warn": "You have been warned by %s",
"txadmin_warn_content": "%s \nAction ID: %s",
"txadmin_scheduledrestart": "Scheduled Restart"
"txadmin_announcement": "Anuncio de servidor de %s",
"txadmin_dm": "Mensaje directo de %s",
"txadmin_warn": "Has sido advertido por %s",
"txadmin_warn_content": "%s \nID de acción: %s",
"txadmin_scheduledrestart": "Reinicio programado"
}
2 changes: 1 addition & 1 deletion server-data/resources/[ox]/ox_lib/resource/interface/client/input.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
local input

---@class InputDialogRowProps
---@field type 'input' | 'number' | 'checkbox' | 'select' | 'slider' | 'multi-select' | 'date' | 'date-range' | 'time' | 'textarea'
---@field type 'input' | 'number' | 'checkbox' | 'select' | 'slider' | 'multi-select' | 'date' | 'date-range' | 'time' | 'textarea' | 'color'
---@field label string
---@field options? { value: string, label: string, default?: string }[]
---@field password? boolean
Expand Down
10 changes: 5 additions & 5 deletions server-data/resources/[ox]/ox_lib/resource/vehicleProperties/client.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,10 @@ function lib.setVehicleProperties(vehicle, props, fixVehicle)
end
end

if fixVehicle then
SetVehicleFixed(vehicle)
end

if props.plate then
SetVehicleNumberPlateText(vehicle, props.plate)
end
Expand Down Expand Up @@ -637,9 +641,5 @@ function lib.setVehicleProperties(vehicle, props, fixVehicle)
SetDriftTyresEnabled(vehicle, true)
end

if fixVehicle then
SetVehicleFixed(vehicle)
end

return true
end
end
10 changes: 5 additions & 5 deletions ...ox_lib/web/build/assets/index-7189c1d3.js → ...ox_lib/web/build/assets/index-c23fc323.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion server-data/resources/[ox]/ox_lib/web/build/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<link rel="icon" type="image/svg+xml" href="/src/favicon.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>NUI React Boilerplate</title>
<script type="module" crossorigin src="./assets/index-7189c1d3.js"></script>
<script type="module" crossorigin src="./assets/index-c23fc323.js"></script>
<link rel="stylesheet" href="./assets/index-281f5198.css">
</head>
<body>
Expand Down
Loading