diff --git a/lol.diff b/lol.diff new file mode 100644 index 0000000..80dcab2 --- /dev/null +++ b/lol.diff @@ -0,0 +1,415 @@ +真气人! +我是在帮一个人弄他的关于 MCBE 技术生存的网站, +一开始他用了一年, 一页一页写, 每一页是完全一样的格式, +就是一个 2xn 的列表, 每个格指向子列表或视频链接. +我帮他弄的使用 elixir 做后端 SSR, toml 写配置. +看看他写的都是什么玩意儿! +然后昨天他又告诉我说他要用 WordPress 重写整个网站. +也不看看 WP 是适用于干什么的. +我问他格式, 他说还是那样, 这种完全重复性工作你怎么这么享受... + + +diff --git a/data/agriculture.toml b/data/agriculture.toml +index 331319c..7eaba90 100644 +--- a/data/agriculture.toml ++++ b/data/agriculture.toml +@@ -1,2 +1 @@ +-#BE生电顶层分区之一农业-完成 + +@@ -9,3 +8,2 @@ description = "村民农田 水流农田 afk作物机" + +-#小麦 + +@@ -32,5 +30,4 @@ videos = [ + +-#瓜类 + +-[Melons] ++[melons] + title = "瓜类" +@@ -38,3 +35,3 @@ description = "飞行器瓜机 检测式瓜机 时钟密堆瓜机 劫掠兽瓜 + +-[Melons.aerocraft] ++[melons.flying_machine] + title = "飞行器瓜机" +@@ -45,3 +42,3 @@ videos = [ + +-[Melons.detecting] ++[melons.detecting] + title = "检测式瓜机" +@@ -52,3 +49,3 @@ videos = [ + +-[Melons.clock] ++[melons.clock] + title = "时钟密堆瓜机" +@@ -60,3 +57,3 @@ videos = [ + +-[Melons.Marauding_beasts] ++[melons.beast] + title = "劫掠兽瓜机" +@@ -67,3 +64,2 @@ videos = [ + +-#甘蔗 + +@@ -73,3 +69,3 @@ description = "飞行器甘蔗机 检测式甘蔗机" + +-[sugarcane.aerocraft] ++[sugarcane.flying_machine] + title = "飞行器甘蔗机" +@@ -87,5 +83,4 @@ videos = [ + +-#紫颂植物 + +-[Purple_Song] ++[chorus] + title = "紫颂植物" +@@ -93,3 +88,3 @@ description = "afk紫颂花农场 紫颂果农场" + +-[Purple_Song.afk] ++[chorus.flower_afk] + title = "afk紫颂花农场" +@@ -100,10 +95,3 @@ videos = [ + +-[Purple_Song.afk] +-title = "afk紫颂花农场" +-description = "花?能吃吗(" +-videos = [ +- "", +-] +- +-[Purple_Song.afk] ++[chorus.fruit_afk] + title = "紫颂果农场" +@@ -114,3 +102,2 @@ videos = [ + +-#仙人掌 + +@@ -124,5 +111,4 @@ videos = [ + +-#小蘑菇 + +-[Small.mushrooms] ++[small_mushroom] + title = "小蘑菇" +@@ -130,3 +116,3 @@ description = "棕蘑菇厂 红蘑菇厂" + +-[detecting.mushrooms] ++[small_mushroom.detect] + title = "检测式小蘑菇" +@@ -137,3 +123,3 @@ videos = [ + +-[clock.mushrooms] ++[small_mushroom.clock] + title = "时钟式小蘑菇农场" +@@ -144,5 +130,4 @@ videos = [ + +-#大蘑菇 + +-[Large.mushrooms] ++[large_mushroom] + title = "大蘑菇" +@@ -150,3 +135,3 @@ description = "棕蘑菇厂 红蘑菇厂" + +-[Brown.mushrooms] ++[large_mushroom.brown] + title = "棕蘑菇厂" +@@ -157,3 +142,3 @@ videos = [ + +-[Red.mushrooms] ++[large_mushroom.red] + title = "红蘑菇厂" +@@ -164,5 +149,4 @@ videos = [ + +-#地狱疣 + +-[Hell warts] ++[nether_wart] + title = "地狱疣" +@@ -173,3 +157,2 @@ videos = [ + +-#藤蔓 + +@@ -182,3 +165,2 @@ videos = [ + +-#可可豆 + +@@ -202,3 +184,2 @@ videos = [ + +-#珊瑚 + +@@ -215,3 +196,3 @@ videos = [ + +-[coral.Dead] ++[coral.dead] + title = "死珊瑚机" +@@ -222,6 +203,4 @@ videos = [ + +-#海泡菜 + + +-#海带 + +@@ -231,3 +210,3 @@ description = "骨粉催熟海带机 飞行器海带机" + +-[kelp.manure] ++[kelp.bonemeal] + title = "骨粉海带机" +@@ -238,3 +217,3 @@ videos = [ + +-[kelp.aerocraft] ++[kelp.flying_machine] + title = "飞行器海带机" +@@ -245,3 +224,2 @@ videos = [ + +-#浆果 + +@@ -265,3 +243,2 @@ videos = [ + +-#竹子 + +@@ -271,3 +248,3 @@ description = "飞行器竹子机 检测式竹子机" + +-[bamboo.aerocraft] ++[bamboo.flying_machine] + title = "飞行器竹子机" +@@ -285,3 +262,2 @@ videos = [ + +-#区块加载催熟 + +@@ -289,5 +265,5 @@ videos = [ + title = "区块加载催熟" +-description = "区块加载催熟瓜机 区块加载催熟竹子机 区块加载催熟海带机 区块加载催熟甘蔗机 区块加载紫颂果农场 区块加载催熟仙人掌机 区块加载蔓延小蘑菇 区块加载催熟地狱疣 区块加载作物机 区块加载多核树场" ++description = "" + +-[load.01] ++[load.melon] + title = "区块加载催熟瓜机" +@@ -297,3 +273,3 @@ videos = [ + +-[load.02] ++[load.banboo] + title = "区块加载催熟竹子机" +@@ -303,3 +279,3 @@ videos = [ + +-[load.03] ++[load.kelp] + title = "区块加载催熟海带机" +@@ -309,3 +285,3 @@ videos = [ + +-[load.04] ++[load.sugarcane] + title = "区块加载催熟甘蔗机" +@@ -315,3 +291,3 @@ videos = [ + +-[load.05] ++[load.chorus] + title = "区块加载紫颂果农场" +@@ -321,3 +297,3 @@ videos = [ + +-[load.06] ++[load.cactus] + title = "区块加载催熟仙人掌机" +@@ -327,3 +303,3 @@ videos = [ + +-[load.07] ++[load.small_mushroom] + title = "区块加载催熟小蘑菇" +@@ -333,3 +309,3 @@ videos = [ + +-[load.08] ++[load.nether_wart] + title = "区块加载催熟地狱疣" +@@ -339,3 +315,3 @@ videos = [ + +-[load.09] ++[load.crop] + title = "区块加载催熟作物机" +@@ -345,3 +321,3 @@ videos = [ + +-[load.10] ++[load.multi_core_tree] + title = "区块加载多核树场" +@@ -351,3 +327,2 @@ videos = [ + +-#抖沙催熟 + +@@ -357,21 +332,3 @@ description = "抖沙海带机 抖沙竹子机 抖沙甘蔗机 抖沙仙人掌" + +-[sand.01] +-title = "区块加载多核树场" +-videos = [ +- "", +-] +- +-[sand.02] +-title = "区块加载多核树场" +-videos = [ +- "", +-] +- +-[sand.03] +-title = "区块加载多核树场" +-videos = [ +- "", +-] +- +-[sand.04] ++[sand.multi_core_tree] + title = "区块加载多核树场" +@@ -381,5 +338,4 @@ videos = [ + +-#更新延后催熟 + +-[Update suppression] ++[update_suppression] + title = "更新延后催熟" +diff --git a/data/duping.toml b/data/duping.toml +index 253290d..caca09f 100644 +--- a/data/duping.toml ++++ b/data/duping.toml +@@ -1,15 +1,15 @@ +-#BE綥֮һ ++#BE生电顶层分区之一复制 + +-title = "" +-description = "Ʒƣħ" ++title = "复制" ++description = "物品复制,附魔复制" + +-#Ʒ ++#物品复制 + + [duping] +-title = "Ʒ" +-description = "ˢ~" ++title = "物品复制" ++description = "刷~" + +-[change name.duping] +-title = "" +-description = "ô" ++[duping.change_name] ++title = "铁砧改名复制" ++description = "怎么做?" + videos = [ +@@ -18,5 +18,5 @@ videos = [ + +-[push container.duping] +-title = "" +-description = "ô" ++[duping.push_container] ++title = "铁砧改名复制" ++description = "怎么做?" + videos = [ +@@ -25,13 +25,7 @@ videos = [ + +-#װ ++#精修装备复制 + +-[duping equipment] +-title = "װ" +-description = "ԭ޸ħ̨" ++[duping.equipment] ++title = "精修装备复制" ++description = "原版无限附魔台" + +-[duping equipment-two] +-title = "" +-description = "ô" +-videos = [ +- "", +-] +diff --git a/data/toplevel.json b/data/toplevel.json +index 17eb713..9c046c2 100644 +--- a/data/toplevel.json ++++ b/data/toplevel.json +@@ -1 +1 @@ +-[{"title":"方块资源获取","path":"block_resources","description":"树场,石材,铁,绿宝石,冰,雪,重力方块,混凝土,黑曜石,末地石,土,树叶,基岩,气泡柱,地狱门方块,地狱岩,羊毛"}] +\ No newline at end of file ++[{"title":"农业","path":"agriculture","description":"哪个玩家不会种地呢?"},{"title":"方块资源获取","path":"block_resources","description":"树场,石材,铁,绿宝石,冰,雪,重力方块,混凝土,黑曜石,末地石,土,树叶,基岩,气泡柱,地狱门方块,地狱岩,羊毛"},{"title":"复制","path":"duping","description":"物品复制,附魔复制"},{"title":"世界控制","path":"world_control","description":"伪和平,方块更新"}] +\ No newline at end of file +diff --git a/data/world_control.toml b/data/world_control.toml +index 246865a..a8febbc 100644 +--- a/data/world_control.toml ++++ b/data/world_control.toml +@@ -1,15 +1,15 @@ +-#BE綥֮һ ++#BE生电顶层分区之一世界控制 + +-title = "" +-description = "αƽ" ++title = "世界控制" ++description = "伪和平,方块更新" + +-#αƽ ++#伪和平 + +-[Pseudo peace] +-title = "αƽ" +-description = "ﶼȥˣ" ++[pseudo_peace] ++title = "伪和平" ++description = "怪物都去哪里了?" + +-[global.Pseudo peace] +-title = "ȫαƽ" +-description = "ػ" ++[pseudo_peace.global] ++title = "全局伪和平" ++description = "来来回回" + videos = [ +@@ -18,5 +18,5 @@ videos = [ + +-[density.Pseudo peace] +-title = "ܶαƽ" +-description = "" ++[pseudo_peace.density] ++title = "密度伪和平" ++description = "缩" + videos = [ +@@ -25,11 +25,11 @@ videos = [ + +-# ++#方块更新 + +-[Pseudo peace] +-title = "" +-description = "" ++[block_update] ++title = "方块更新" ++description = "。。。" + +-[pendingtikc update delayed] +-title = "pendingtikcӺ" +-description = "Ῠ" ++[block_update.delayed] ++title = "pendingtikc更新延后" ++description = "会卡顿吗" + videos = [ +diff --git a/rtsp/mix.exs b/rtsp/mix.exs +index cfb4af0..4a218d2 100644 +--- a/rtsp/mix.exs ++++ b/rtsp/mix.exs +@@ -27,3 +27,3 @@ defmodule Rtsp.MixProject do + {:poison, "~> 5.0"}, +- {:toml, "~> 0.6.2"} ++ {:toml, "~> 0.7"} + ] +diff --git a/rtsp/mix.lock b/rtsp/mix.lock +index 746f146..daf22db 100644 +--- a/rtsp/mix.lock ++++ b/rtsp/mix.lock +@@ -19,3 +19,3 @@ + "telemetry": {:hex, :telemetry, "1.1.0", "a589817034a27eab11144ad24d5c0f9fab1f58173274b1e9bae7074af9cbee51", [:rebar3], [], "hexpm", "b727b2a1f75614774cff2d7565b64d0dfa5bd52ba517f16543e6fc7efcc0df48"}, +- "toml": {:hex, :toml, "0.6.2", "38f445df384a17e5d382befe30e3489112a48d3ba4c459e543f748c2f25dd4d1", [:mix], [], "hexpm", "d013e45126d74c0c26a38d31f5e8e9b83ea19fc752470feb9a86071ca5a672fa"}, ++ "toml": {:hex, :toml, "0.7.0", "fbcd773caa937d0c7a02c301a1feea25612720ac3fa1ccb8bfd9d30d822911de", [:mix], [], "hexpm", "0690246a2478c1defd100b0c9b89b4ea280a22be9a7b313a8a058a2408a2fa70"}, + "unicode_util_compat": {:hex, :unicode_util_compat, "0.7.0", "bc84380c9ab48177092f43ac89e4dfa2c6d62b40b8bd132b1059ecc7232f9a78", [:rebar3], [], "hexpm", "25eee6d67df61960cf6a794239566599b09e17e668d3700247bc498638152521"}, +diff --git a/www/template.html.eex b/www/template.html.eex +index feb7661..9a90490 100644 +--- a/www/template.html.eex ++++ b/www/template.html.eex +@@ -53,3 +53,3 @@ + home-icon +-
主页
++
主页
+ diff --git a/patches/gmi.sh b/patches/gmi.sh index 9b767b0..14c0ee4 100755 --- a/patches/gmi.sh +++ b/patches/gmi.sh @@ -1,3 +1,4 @@ #! /bin/sh ls gmi | xargs -I {} ln -s gmi/{} {}.txt +ln -s lol.diff lol.diff.txt diff --git a/posts.md b/posts.md index b873d69..1a05ff1 100644 --- a/posts.md +++ b/posts.md @@ -1,5 +1,6 @@ ## Table of Contents ### Posts (sorted by time) +- [一个乐子 commit](lol.diff.txt)
- [一次大备份](backup_everything)
- [2023 了, 试试 emacs 29](emacs29_2023)
- [Fix TTY after Fedora 37 Upgrade](fix_tty)