diff --git a/LICENSE.txt b/LICENSE.txt index 7504c0e..36cd7db 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -65,9 +65,6 @@ Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) intersex, polyamorous, queer, maverique, neutrois, multigender, polygender: by Wuzzy - progress - by Edgy1 - You are free to: Share — copy and redistribute the material in any medium or format. Adapt — remix, transform, and build upon the material for any purpose, even commercially. diff --git a/README.txt b/README.txt index 38dbcd1..003e51a 100644 --- a/README.txt +++ b/README.txt @@ -1,7 +1,7 @@ -Pride Flags Mod v2.2.0 +Pride Flags Mod v2.0.5 By Leslie E. Krause and Wuzzy -Pride Flags adds a variety of animated flags to celebrate Pride in Luanti. +Pride Flags adds a variety of animated flags to celebrate Pride in Minetest. This adds two blocks: @@ -29,10 +29,8 @@ List of flags -------------------- These flags are available: -* Broader community: - * Gay/LGBTQ+ (rainbow flag) - * Progress Pride * Orientations (sexual, romantic or other) + * Gay/LGBTQ+ (rainbow flag) * Lesbian * Vincian * Sexual orientations @@ -85,7 +83,7 @@ Browse source code... Compatability ---------------------- -Luanti/Minetest version 5.4.0 or later required. +Minetest 5.4.0 or later required. (older versions might work, too, but the flag waving sound is buggy) @@ -103,9 +101,3 @@ The source code is licensed under the LGPLv3. The media is licensed under CC BY-SA 3.0. See LICENSE.txt for details and credits. - -Translation credits: - -* German: Wuzzy -* French: Z-Master -* Spanish: megustanlosfrijoles diff --git a/init.lua b/init.lua index 4ddabd7..0f7b718 100644 --- a/init.lua +++ b/init.lua @@ -1,5 +1,5 @@ -------------------------------------------------------- --- Luanti :: Pride Flags Mod (pride_flags) +-- Minetest :: Pride Flags Mod (pride_flags) -- -- See README.txt for licensing and other information. -- Copyright (c) 2022, Leslie E. Krause and Wuzzy @@ -10,7 +10,7 @@ pride_flags = {} local wind_noise = PerlinNoise( 204, 1, 0, 500 ) -- Check whether the new `get_2d` Perlin function is available, -- otherwise use `get2d`. Needed to suppress deprecation --- warning in newer Luanti versions. +-- warning in newer Minetest versions. local old_get2d = true if wind_noise.get_2d then old_get2d = false @@ -25,8 +25,7 @@ local rad_90 = pi / 2 local DEFAULT_FLAG = "rainbow" -- Flag list for the old number-based storing of flags, used up to --- 8fd4f9661e123bc84c0499c4809537e8aeb24c3b. --- DO NOT CHANGE THIS LIST! +-- 8fd4f9661e123bc84c0499c4809537e8aeb24c3b. Do not change this list! local legacy_flag_list = { "rainbow", "lesbian", "bisexual", "transgender", "genderqueer", "nonbinary", "pansexual", "asexual", "vincian", "polysexual", "omnisexual", "graysexual", "demisexual", "homoromantic", "biromantic", @@ -35,9 +34,8 @@ local legacy_flag_list = { "genderfluid", "intersex", "polyamorous", "queer", "demigirl", "demiboy", "bigender", "trigender", } local flag_list = { - -- broader community - "rainbow", -- rainbow flag / LGBTQ+ Pride flag / Gay Pride flag - "progress", -- Progress Pride + -- rainbow flag / LGBT+ Pride flag / Gay Pride flag + "rainbow", -- orientations (general) "lesbian", "vincian", -- sexual orientations @@ -364,7 +362,7 @@ local function cycle_flag( pos, player, cycle_backwards ) local pname = player:get_player_name( ) if minetest.is_protected( pos, pname ) and not minetest.check_player_privs( pname, "protection_bypass") then - minetest.record_protection_violation( pos, pname ) + minetest.register_protection_violation( pos, pname ) return end @@ -422,7 +420,7 @@ minetest.register_node( "pride_flags:upper_mast", { node_placement_prediction = "", on_place = function( itemstack, placer, pointed_thing ) - if pointed_thing.type ~= "node" then + if not pointed_thing.type == "node" then return itemstack end diff --git a/locale/pride_flags.de.tr b/locale/pride_flags.de.tr index a23fe1e..8d79265 100644 --- a/locale/pride_flags.de.tr +++ b/locale/pride_flags.de.tr @@ -1,5 +1,3 @@ # textdomain:pride_flags -Pride Flags=Pride-Flaggen -Adds a variety of animated flags to celebrate Pride.=Fügt eine Reihe an animierten Flaggen hinzu, um Pride (LGBTQ+) zu feiern. Flag Pole=Flaggenmast Flag Pole with Flag=Flaggenmast mit Flagge diff --git a/locale/pride_flags.es.tr b/locale/pride_flags.es.tr deleted file mode 100644 index bb82ad1..0000000 --- a/locale/pride_flags.es.tr +++ /dev/null @@ -1,5 +0,0 @@ -# textdomain:pride_flags -Pride Flags=Banderas del orgullo -Adds a variety of animated flags to celebrate Pride.=Añade una variedad de banderas animadas para celebrar el orgullo -Flag Pole=Asta -Flag Pole with Flag=Asta con bandera diff --git a/locale/pride_flags.fr.tr b/locale/pride_flags.fr.tr deleted file mode 100644 index 29259b7..0000000 --- a/locale/pride_flags.fr.tr +++ /dev/null @@ -1,5 +0,0 @@ -# textdomain: pride_flags -Pride Flags= -Adds a variety of animated flags to celebrate Pride.= -Flag Pole=Mât -Flag Pole with Flag=Mât avec drapeau diff --git a/locale/template.txt b/locale/template.txt index 7cca9bc..7f49cdc 100644 --- a/locale/template.txt +++ b/locale/template.txt @@ -1,5 +1,3 @@ # textdomain:pride_flags -Pride Flags= -Adds a variety of animated flags to celebrate Pride.= Flag Pole= Flag Pole with Flag= diff --git a/textures/prideflag_polyamorous.png b/textures/prideflag_polyamorous.png index 5041606..0dca061 100644 Binary files a/textures/prideflag_polyamorous.png and b/textures/prideflag_polyamorous.png differ diff --git a/textures/prideflag_progress.png b/textures/prideflag_progress.png deleted file mode 100644 index aff67ba..0000000 Binary files a/textures/prideflag_progress.png and /dev/null differ