Merge remote-tracking branch 'origin/upstream'

2025-08-26 18:21:04 +00:00 · 2011-07-31 20:04:04 +02:00 · 2011-07-31 20:04:04 +02:00 · 7ece67727d
commit 7ece67727d
parent 831003156c 303351de6d
30 changed files with 233 additions and 52 deletions
--- a/data/cooked_rat.png
+++ b/data/cooked_rat.png
--- a/data/nc_back.png
+++ b/data/nc_back.png
--- a/data/nc_front.png
+++ b/data/nc_front.png
--- a/data/nc_rb.png
+++ b/data/nc_rb.png
--- a/data/nc_side.png
+++ b/data/nc_side.png
--- a/data/scorched_stuff.png
+++ b/data/scorched_stuff.png
--- a/data/tool_steelsword.png
+++ b/data/tool_steelsword.png
--- a/data/tool_stonesword.png
+++ b/data/tool_stonesword.png
--- a/data/tool_woodsword.png
+++ b/data/tool_woodsword.png