From e63eef92bb0732bbb43976731ba6e0c71005e7ad Mon Sep 17 00:00:00 2001 From: anne-o-pixel <81879599+anne-o-pixel@users.noreply.github.com> Date: Wed, 4 Aug 2021 10:46:20 +0200 Subject: [PATCH 1/2] Move to ttools repo --- DependencyControl.json | 4 ++-- ua.Colorize.lua | 2 +- ua.Cycles.lua | 2 +- ua.FadeWorks.lua | 2 +- ua.HYDRA.lua | 4 ++-- ua.LineBreaker.lua | 2 +- ua.Masquerade.lua | 2 +- ua.MultiCopy.lua | 2 +- ua.MultiLineEditor.lua | 2 +- ua.NecrosCopy.lua | 2 +- ua.Recalculator.lua | 2 +- ua.Relocator.lua | 2 +- ua.ScriptCleanup.lua | 2 +- ua.Selectrix.lua | 2 +- ua.ShiftCut.lua | 2 +- ua.Significance.lua | 2 +- 16 files changed, 18 insertions(+), 18 deletions(-) diff --git a/DependencyControl.json b/DependencyControl.json index 7426086..8e31380 100644 --- a/DependencyControl.json +++ b/DependencyControl.json @@ -2,8 +2,8 @@ "dependencyControlFeedFormatVersion": "0.2.0", "name": "unanimated's Automation Scripts", "description": "Secondary repository for most of unanimated's automation scripts.", - "baseUrl": "https://github.com/unanimated/luaegisub", - "fileBaseUrl": "https://raw.githubusercontent.com/unanimated/luaegisub/@{channel}/@{namespace}", + "baseUrl": "https://github.com/TypesettingTools/unanimated-Aegisub-Scripts", + "fileBaseUrl": "https://raw.githubusercontent.com/TypesettingTools/unanimated-Aegisub-Scripts/@{channel}/@{namespace}", "url": "@{baseUrl}", "maintainer": "unanimated", "macros": { diff --git a/ua.Colorize.lua b/ua.Colorize.lua index b5b6036..cc78f87 100644 --- a/ua.Colorize.lua +++ b/ua.Colorize.lua @@ -7,7 +7,7 @@ script_namespace="ua.Colourise" local haveDepCtrl,DependencyControl,depRec=pcall(require,"l0.DependencyControl") if haveDepCtrl then script_version="5.0.0" - depRec=DependencyControl{feed="https://raw.githubusercontent.com/unanimated/luaegisub/master/DependencyControl.json"} + depRec=DependencyControl{feed="https://raw.githubusercontent.com/TypesettingTools/unanimated-Aegisub-Scripts/master/DependencyControl.json"} end info={} diff --git a/ua.Cycles.lua b/ua.Cycles.lua index ea9e5df..50a49b5 100644 --- a/ua.Cycles.lua +++ b/ua.Cycles.lua @@ -9,7 +9,7 @@ script_namespace="ua.Cycles" local haveDepCtrl,DependencyControl,depRec=pcall(require,"l0.DependencyControl") if haveDepCtrl then script_version="2.0.0" - depRec=DependencyControl{feed="https://raw.githubusercontent.com/unanimated/luaegisub/master/DependencyControl.json"} + depRec=DependencyControl{feed="https://raw.githubusercontent.com/TypesettingTools/unanimated-Aegisub-Scripts/master/DependencyControl.json"} end -- SETTINGS - You can change these sequences diff --git a/ua.FadeWorks.lua b/ua.FadeWorks.lua index e568685..37293c1 100644 --- a/ua.FadeWorks.lua +++ b/ua.FadeWorks.lua @@ -7,7 +7,7 @@ script_namespace="ua.Fadeworks" local haveDepCtrl,DependencyControl,depRec=pcall(require,"l0.DependencyControl") if haveDepCtrl then script_version="5.0.0" - depRec=DependencyControl{feed="https://raw.githubusercontent.com/unanimated/luaegisub/master/DependencyControl.json"} + depRec=DependencyControl{feed="https://raw.githubusercontent.com/TypesettingTools/unanimated-Aegisub-Scripts/master/DependencyControl.json"} end re=require'aegisub.re' diff --git a/ua.HYDRA.lua b/ua.HYDRA.lua index 029a515..0e36096 100644 --- a/ua.HYDRA.lua +++ b/ua.HYDRA.lua @@ -4,14 +4,14 @@ script_name="HYDRA" script_description="A multi-headed typesetting beast. Scary as Hell." script_author="unanimated" script_url1="http://unanimated.hostfree.pw/ts/hydra.lua" -script_url2="https://raw.githubusercontent.com/unanimated/luaegisub/master/hydra.lua" +script_url2="https://raw.githubusercontent.com/TypesettingTools/unanimated-Aegisub-Scripts/master/hydra.lua" script_version="6.1" script_namespace="ua.HYDRA" local haveDepCtrl,DependencyControl,depRec=pcall(require,"l0.DependencyControl") if haveDepCtrl then script_version="6.1.0" - depRec=DependencyControl{feed="https://raw.githubusercontent.com/unanimated/luaegisub/master/DependencyControl.json"} + depRec=DependencyControl{feed="https://raw.githubusercontent.com/TypesettingTools/unanimated-Aegisub-Scripts/master/DependencyControl.json"} end re=require'aegisub.re' diff --git a/ua.LineBreaker.lua b/ua.LineBreaker.lua index 64deae8..621cc55 100644 --- a/ua.LineBreaker.lua +++ b/ua.LineBreaker.lua @@ -9,7 +9,7 @@ script_namespace="ua.LineBreaker" local haveDepCtrl,DependencyControl,depRec=pcall(require,"l0.DependencyControl") if haveDepCtrl then script_version="2.4.0" - depRec=DependencyControl{feed="https://raw.githubusercontent.com/unanimated/luaegisub/master/DependencyControl.json"} + depRec=DependencyControl{feed="https://raw.githubusercontent.com/TypesettingTools/unanimated-Aegisub-Scripts/master/DependencyControl.json"} end re=require'aegisub.re' diff --git a/ua.Masquerade.lua b/ua.Masquerade.lua index a2791ac..0a2b2f4 100644 --- a/ua.Masquerade.lua +++ b/ua.Masquerade.lua @@ -7,7 +7,7 @@ script_namespace="ua.Masquerade" local haveDepCtrl,DependencyControl,depRec=pcall(require,"l0.DependencyControl") if haveDepCtrl then script_version="3.0.0" - depRec=DependencyControl{feed="https://raw.githubusercontent.com/unanimated/luaegisub/master/DependencyControl.json"} + depRec=DependencyControl{feed="https://raw.githubusercontent.com/TypesettingTools/unanimated-Aegisub-Scripts/master/DependencyControl.json"} end hlp=[[ Full manual: http://unanimated.hostfree.pw/ts/scripts-manuals.htm#masquerade diff --git a/ua.MultiCopy.lua b/ua.MultiCopy.lua index bdd1da9..c61982c 100644 --- a/ua.MultiCopy.lua +++ b/ua.MultiCopy.lua @@ -10,7 +10,7 @@ script_namespace="ua.MultiCopy" local haveDepCtrl,DependencyControl,depRec=pcall(require,"l0.DependencyControl") if haveDepCtrl then script_version="4.0.0" - depRec=DependencyControl{feed="https://raw.githubusercontent.com/unanimated/luaegisub/master/DependencyControl.json"} + depRec=DependencyControl{feed="https://raw.githubusercontent.com/TypesettingTools/unanimated-Aegisub-Scripts/master/DependencyControl.json"} end clipboard=require'aegisub.clipboard' diff --git a/ua.MultiLineEditor.lua b/ua.MultiLineEditor.lua index af0c8bc..7e03ad6 100644 --- a/ua.MultiLineEditor.lua +++ b/ua.MultiLineEditor.lua @@ -9,7 +9,7 @@ script_namespace="ua.MultiLineEditor" local haveDepCtrl,DependencyControl,depRec=pcall(require,"l0.DependencyControl") if haveDepCtrl then script_version="1.8.0" - depRec=DependencyControl{feed="https://raw.githubusercontent.com/unanimated/luaegisub/master/DependencyControl.json"} + depRec=DependencyControl{feed="https://raw.githubusercontent.com/TypesettingTools/unanimated-Aegisub-Scripts/master/DependencyControl.json"} end re=require'aegisub.re' diff --git a/ua.NecrosCopy.lua b/ua.NecrosCopy.lua index 66d1169..9e0b139 100644 --- a/ua.NecrosCopy.lua +++ b/ua.NecrosCopy.lua @@ -7,7 +7,7 @@ script_namespace="ua.NecrosCopy" local haveDepCtrl,DependencyControl,depRec=pcall(require,"l0.DependencyControl") if haveDepCtrl then script_version="4.1.0" - depRec=DependencyControl{feed="https://raw.githubusercontent.com/unanimated/luaegisub/master/DependencyControl.json"} + depRec=DependencyControl{feed="https://raw.githubusercontent.com/TypesettingTools/unanimated-Aegisub-Scripts/master/DependencyControl.json"} end re=require'aegisub.re' diff --git a/ua.Recalculator.lua b/ua.Recalculator.lua index f0b3e09..a0d1532 100644 --- a/ua.Recalculator.lua +++ b/ua.Recalculator.lua @@ -19,7 +19,7 @@ script_namespace="ua.Recalculator" local haveDepCtrl,DependencyControl,depRec=pcall(require,"l0.DependencyControl") if haveDepCtrl then script_version="4.0.0" - depRec=DependencyControl{feed="https://raw.githubusercontent.com/unanimated/luaegisub/master/DependencyControl.json"} + depRec=DependencyControl{feed="https://raw.githubusercontent.com/TypesettingTools/unanimated-Aegisub-Scripts/master/DependencyControl.json"} end re=require'aegisub.re' diff --git a/ua.Relocator.lua b/ua.Relocator.lua index 72f787f..58a8bc7 100644 --- a/ua.Relocator.lua +++ b/ua.Relocator.lua @@ -11,7 +11,7 @@ script_namespace="ua.Relocator" local haveDepCtrl,DependencyControl,depRec=pcall(require,"l0.DependencyControl") if haveDepCtrl then script_version="4.5.0" - depRec=DependencyControl{feed="https://raw.githubusercontent.com/unanimated/luaegisub/master/DependencyControl.json"} + depRec=DependencyControl{feed="https://raw.githubusercontent.com/TypesettingTools/unanimated-Aegisub-Scripts/master/DependencyControl.json"} end re=require'aegisub.re' diff --git a/ua.ScriptCleanup.lua b/ua.ScriptCleanup.lua index a5b5903..06b20fa 100644 --- a/ua.ScriptCleanup.lua +++ b/ua.ScriptCleanup.lua @@ -9,7 +9,7 @@ script_namespace="ua.ScriptCleanup" local haveDepCtrl,DependencyControl,depRec=pcall(require,"l0.DependencyControl") if haveDepCtrl then script_version="5.0.0" - depRec=DependencyControl{feed="https://raw.githubusercontent.com/unanimated/luaegisub/master/DependencyControl.json"} + depRec=DependencyControl{feed="https://raw.githubusercontent.com/TypesettingTools/unanimated-Aegisub-Scripts/master/DependencyControl.json"} end dont_delete_empty_tags=false -- option to not delete {} diff --git a/ua.Selectrix.lua b/ua.Selectrix.lua index a1dea0b..5246fc9 100644 --- a/ua.Selectrix.lua +++ b/ua.Selectrix.lua @@ -9,7 +9,7 @@ script_namespace="ua.Selectrix" local haveDepCtrl,DependencyControl,depRec=pcall(require,"l0.DependencyControl") if haveDepCtrl then script_version="3.4.0" - depRec=DependencyControl{feed="https://raw.githubusercontent.com/unanimated/luaegisub/master/DependencyControl.json"} + depRec=DependencyControl{feed="https://raw.githubusercontent.com/TypesettingTools/unanimated-Aegisub-Scripts/master/DependencyControl.json"} end re=require'aegisub.re' diff --git a/ua.ShiftCut.lua b/ua.ShiftCut.lua index ec2bea2..714bbf3 100644 --- a/ua.ShiftCut.lua +++ b/ua.ShiftCut.lua @@ -11,7 +11,7 @@ re=require'aegisub.re' local haveDepCtrl,DependencyControl,depRec=pcall(require,"l0.DependencyControl") if haveDepCtrl then script_version="3.1.0" - depRec=DependencyControl{feed="https://raw.githubusercontent.com/unanimated/luaegisub/master/DependencyControl.json"} + depRec=DependencyControl{feed="https://raw.githubusercontent.com/TypesettingTools/unanimated-Aegisub-Scripts/master/DependencyControl.json"} end function shiftcut(subs,sel,act) diff --git a/ua.Significance.lua b/ua.Significance.lua index 6dd61de..059b009 100644 --- a/ua.Significance.lua +++ b/ua.Significance.lua @@ -7,7 +7,7 @@ script_namespace="ua.Significance" local haveDepCtrl,DependencyControl,depRec=pcall(require,"l0.DependencyControl") if haveDepCtrl then script_version="3.5.0" - depRec=DependencyControl{feed="https://raw.githubusercontent.com/unanimated/luaegisub/master/DependencyControl.json"} + depRec=DependencyControl{feed="https://raw.githubusercontent.com/TypesettingTools/unanimated-Aegisub-Scripts/master/DependencyControl.json"} end clipboard=require("aegisub.clipboard") From 06056a08f6265cbbba38a988dc553e745713124a Mon Sep 17 00:00:00 2001 From: anne-o-pixel <81879599+anne-o-pixel@users.noreply.github.com> Date: Wed, 4 Aug 2021 10:59:55 +0200 Subject: [PATCH 2/2] Cancer -> Cancel (GUI) Upstream change https://github.com/unanimated/unanimated.github.io/pull/4 --- DependencyControl.json | 7 ++++--- ua.ScriptCleanup.lua | 7 +++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/DependencyControl.json b/DependencyControl.json index 8e31380..26fa54b 100644 --- a/DependencyControl.json +++ b/DependencyControl.json @@ -137,19 +137,20 @@ "description": "Removes selected stuff from script", "channels": { "master": { - "version": "5.0.0", - "released": "2018-06-10", + "version": "5.0.1", + "released": "2021-08-04", "default": true, "files": [ { "name": ".lua", "url": "@{fileBaseUrl}@{fileName}", - "sha1": "43addccdac9a6a7bc85ded9450075edb767df5f3" + "sha1": "74c61c2a4b3c468bbd87ec68ff6eaf11a0b42763" } ] } }, "changelog": { + "5.0.1": ["Cancer -> Cancel in GUI"], "5.0.0": ["Check the Updates page"] } }, diff --git a/ua.ScriptCleanup.lua b/ua.ScriptCleanup.lua index 06b20fa..fdfb167 100644 --- a/ua.ScriptCleanup.lua +++ b/ua.ScriptCleanup.lua @@ -3,12 +3,11 @@ script_name="Script Cleanup" script_description="Garbage disposal and elimination of incriminating evidence" script_author="unanimated" -script_version="5.0" +script_version="5.0.1" script_namespace="ua.ScriptCleanup" local haveDepCtrl,DependencyControl,depRec=pcall(require,"l0.DependencyControl") if haveDepCtrl then - script_version="5.0.0" depRec=DependencyControl{feed="https://raw.githubusercontent.com/TypesettingTools/unanimated-Aegisub-Scripts/master/DependencyControl.json"} end @@ -726,8 +725,8 @@ GUI={ {x=8,y=12,height=2,class="checkbox",name="hidline",label="hide\ninline",hint='Hide ALL inline tags'}, } P,res=ADD(GUI, - {"Run selected","Comments","Tags","Dial 5","Clean Tags","^ Kill Tags","Hide Tags","Cancer"},{ok='Run selected',cancel='Cancer'}) - if P=="Cancer" then ak() end + {"Run selected","Comments","Tags","Dial 5","Clean Tags","^ Kill Tags","Hide Tags","Cancel"},{ok='Run selected',cancel='Cancel'}) + if P=="Cancel" then ak() end if P=="^ Kill Tags" then killemall(subs,sel) end if P=="Hide Tags" then hide_tags(subs,sel) end if P=="Comments" then res.nocom=true cleanlines(subs,sel) end