Skip to content

Commit

Permalink
Merge pull request #736 from bitpredator/dev
Browse files Browse the repository at this point in the history
fix: Minor fixes for the crafting system
  • Loading branch information
bitpredator authored Jun 22, 2024
2 parents 83c9821 + fc96bc5 commit 4d0d890
Show file tree
Hide file tree
Showing 93 changed files with 683 additions and 268 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ INSERT INTO `bpt_items` (`name`, `label`) VALUES
('WEAPON_APPISTOL', 'WEAPON APPISTOL'),
('iron', 'iron'),
('hammer', 'hammer'),
('legnatagliata', 'asse di legno'),
('wood', 'Legna'),
('fixkit', 'fixkit'),
('almondmilk', 'almondmilk'),
('ice', 'ice'),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ RegisterNUICallback("craft", function(data)
end)

function SendTextMessage(msg)
exports["mythic_notify"]:DoHudText("inform", msg)
exports["mythic_notify"]:SendAlert("inform", msg)
end

function DrawText3D(x, y, z, text)
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ CreateThread(function()
SetBlipAsShortRange(blip, true)

BeginTextCommandSetBlipName("STRING")
AddTextComponentSubstringPlayerName(TranslateCap("blipTranslateCapnicorn"))
AddTextComponentSubstringPlayerName(TranslateCap("blip_unicorn"))
EndTextCommandSetBlipName(blip)
end)

Expand Down
17 changes: 8 additions & 9 deletions server-data/resources/[maps]/SLBK11_MissionRow/fxmanifest.lua
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
fx_version 'adamant'
fx_version("adamant")
version "1.0.1"

game 'gta5'
game("gta5")

description 'mission row police map'

this_is_a_map 'yes'

client_script {
"client/main.lua"
}
description("mission row police map")

this_is_a_map("yes")

client_script({
"client/*.lua",
})

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 4d0d890

Please sign in to comment.