Merge branch 'master' of https://git.socklab.moe/chimchooree/blessfrey-bottle

src/static/xml/blessfrey.xml

@@ -7,6 +7,14 @@
 <language>en-us</language>
 <webMaster>chimchooree@mail.com (chimchooree)</webMaster>
 <item>
+<title>october 2021: catch-up </title>
+<link>https://www.blessfrey.me/diary/entries/211101</link>
+<description>summary Mostly catching up to deadlines, giving extra play-time to kitty, and making new friends in ... </description>
+<pubDate>Mon, 01 Nov 2021 05:00:05 GMT</pubDate>
+<guid>https://www.blessfrey.me/diary/entries/211101</guid>
+</item>
+<item>
+>>>>>>> bb56955c4af1f573bba2b58ca1b6b9bd6e988904
 <title>context controls: what do I do after I arrive at target? </title>
 <link>https://www.blessfrey.me/diary/entries/211021</link>
 <description>My biggest hang-up right now is programming the controls to do what a player would expect them to ... </description>
@@ -37,7 +45,7 @@
 <item>
 <title>how to attack a moving target </title>
 <link>https://www.blessfrey.me/diary/entries/210708</link>
-<description>Househunting has been unexpectedly time-consuming, but I'll share the tentative design for the ... </description>
+<description>I'll share my tentative design for the attack-movement loop. The attack-movement loop needs to ... </description>
 <pubDate>Thu, 08 Jul 2021 05:00:05 GMT</pubDate>
 <guid>https://www.blessfrey.me/diary/entries/210708</guid>
 </item>
@@ -104,12 +112,5 @@
 <pubDate>Thu, 15 Apr 2021 05:00:05 GMT</pubDate>
 <guid>https://www.blessfrey.me/diary/entries/210415</guid>
 </item>
-<item>
-<title>a look into an RPG achievement system </title>
-<link>https://www.blessfrey.me/diary/entries/210402</link>
-<description>Designing an achievement system without any octopus tangles. what does blessfrey consider an ... </description>
-<pubDate>Fri, 02 Apr 2021 05:00:05 GMT</pubDate>
-<guid>https://www.blessfrey.me/diary/entries/210402</guid>
-</item>
 </channel>
 </rss>