diff --git a/common/nori/export.go b/common/nori/export.go index 5601778..0bba89f 100644 --- a/common/nori/export.go +++ b/common/nori/export.go @@ -38,14 +38,18 @@ func (n *Nori) ExportAnimation(num int) (*apng.APNG, error) { for _, frame := range n.Animations[num].Frames { planes := frame.Planes var canvasRect image.Rectangle - for _, plane := range planes { + for i, plane := range planes { if int(plane.BitmapId) >= len(n.Gawi.Images) { log.Printf("could not find bitmap %d, only have %d", plane.BitmapId, len(n.Gawi.Images)) } bitmap := n.Gawi.Images[plane.BitmapId] pt := image.Pt(int(plane.PlaneX), int(plane.PlaneY)) // where to put the point - rc := bitmap.Img.Bounds() - canvasRect = canvasRect.Union(rc.Add(pt)) + rc := bitmap.Img.Bounds().Add(pt) // translate rectangle to put in the global canvas + if i == 0 { + canvasRect = rc + } else { + canvasRect = canvasRect.Union(rc) + } } img := image.NewNRGBA64(canvasRect) for _, plane := range planes { @@ -63,9 +67,8 @@ func (n *Nori) ExportAnimation(num int) (*apng.APNG, error) { } _ = transparent pt := image.Pt(int(plane.PlaneX), int(plane.PlaneY)) // where to put the point + rc := bitmap.Img.Bounds().Add(pt) src := bitmap.Img - sr := src.Bounds() - r := image.Rectangle{pt, pt.Add(sr.Size())} switch plane.Blend { case BlendMode_Alpha: case BlendMode_Mul, BlendMode_Mul7: @@ -78,10 +81,11 @@ func (n *Nori) ExportAnimation(num int) (*apng.APNG, error) { default: return nil, fmt.Errorf("unknown blend mode: %d", plane.Blend) } - draw.Draw(img, - r, + draw.Draw( + img, + rc, src, - sr.Min, + src.Bounds().Min, draw.Src, ) } @@ -95,12 +99,14 @@ func (n *Nori) ExportAnimation(num int) (*apng.APNG, error) { return nil, fmt.Errorf("no frames found for animation") } for i, realFrame := range images { + log.Info().Int("frame", num).Interface("rect", or).Interface("frame", realFrame.Bounds()).Msg("") + src := realFrame big := image.NewNRGBA64(or) draw.Draw( big, - big.Rect, - realFrame, - realFrame.Bounds().Min, + src.Bounds(), + src, + src.Bounds().Min, draw.Src, ) fr := apng.Frame{ @@ -112,6 +118,5 @@ func (n *Nori) ExportAnimation(num int) (*apng.APNG, error) { } a.Frames = append(a.Frames, fr) } - log.Println(num, len(a.Frames)) return a, nil } diff --git a/common/nori/nori_test.go b/common/nori/nori_test.go index 7d071d5..4ff89bf 100644 --- a/common/nori/nori_test.go +++ b/common/nori/nori_test.go @@ -75,7 +75,7 @@ func writeApng(nori *Nori, name string) error { if err != nil { return err } - err = os.WriteFile(fmt.Sprintf("./nori_test/%s%s/animation_%d.apng", name, postfix, i), out.Bytes(), 0740) + err = os.WriteFile(fmt.Sprintf("./nori_test/%s%s/animation_%d.png", name, postfix, i), out.Bytes(), 0740) if err != nil { return err } diff --git a/common/nori/nori_test/palette.example/animation_0.apng b/common/nori/nori_test/palette.example/animation_0.png similarity index 100% rename from common/nori/nori_test/palette.example/animation_0.apng rename to common/nori/nori_test/palette.example/animation_0.png diff --git a/common/nori/nori_test/palette.example/animation_1.apng b/common/nori/nori_test/palette.example/animation_1.png similarity index 100% rename from common/nori/nori_test/palette.example/animation_1.apng rename to common/nori/nori_test/palette.example/animation_1.png diff --git a/common/nori/nori_test/palette.example/animation_10.apng b/common/nori/nori_test/palette.example/animation_10.apng deleted file mode 100755 index 9a49368..0000000 Binary files a/common/nori/nori_test/palette.example/animation_10.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_10.png b/common/nori/nori_test/palette.example/animation_10.png new file mode 100755 index 0000000..d7a63ff Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_10.png differ diff --git a/common/nori/nori_test/palette.example/animation_100.apng b/common/nori/nori_test/palette.example/animation_100.apng deleted file mode 100755 index de079e9..0000000 Binary files a/common/nori/nori_test/palette.example/animation_100.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_100.png b/common/nori/nori_test/palette.example/animation_100.png new file mode 100755 index 0000000..25e9089 Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_100.png differ diff --git a/common/nori/nori_test/palette.example/animation_101.apng b/common/nori/nori_test/palette.example/animation_101.apng deleted file mode 100755 index de079e9..0000000 Binary files a/common/nori/nori_test/palette.example/animation_101.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_101.png b/common/nori/nori_test/palette.example/animation_101.png new file mode 100755 index 0000000..803163f Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_101.png differ diff --git a/common/nori/nori_test/palette.example/animation_102.apng b/common/nori/nori_test/palette.example/animation_102.png similarity index 100% rename from common/nori/nori_test/palette.example/animation_102.apng rename to common/nori/nori_test/palette.example/animation_102.png diff --git a/common/nori/nori_test/palette.example/animation_103.apng b/common/nori/nori_test/palette.example/animation_103.png similarity index 100% rename from common/nori/nori_test/palette.example/animation_103.apng rename to common/nori/nori_test/palette.example/animation_103.png diff --git a/common/nori/nori_test/palette.example/animation_104.apng b/common/nori/nori_test/palette.example/animation_104.apng deleted file mode 100755 index 0d5aeb3..0000000 Binary files a/common/nori/nori_test/palette.example/animation_104.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_104.png b/common/nori/nori_test/palette.example/animation_104.png new file mode 100755 index 0000000..517b7fa Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_104.png differ diff --git a/common/nori/nori_test/palette.example/animation_105.apng b/common/nori/nori_test/palette.example/animation_105.apng deleted file mode 100755 index 1163f60..0000000 Binary files a/common/nori/nori_test/palette.example/animation_105.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_105.png b/common/nori/nori_test/palette.example/animation_105.png new file mode 100755 index 0000000..0a269e8 Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_105.png differ diff --git a/common/nori/nori_test/palette.example/animation_106.apng b/common/nori/nori_test/palette.example/animation_106.apng deleted file mode 100755 index bd50934..0000000 Binary files a/common/nori/nori_test/palette.example/animation_106.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_106.png b/common/nori/nori_test/palette.example/animation_106.png new file mode 100755 index 0000000..7ea04b2 Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_106.png differ diff --git a/common/nori/nori_test/palette.example/animation_107.apng b/common/nori/nori_test/palette.example/animation_107.apng deleted file mode 100755 index f1f4a58..0000000 Binary files a/common/nori/nori_test/palette.example/animation_107.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_107.png b/common/nori/nori_test/palette.example/animation_107.png new file mode 100755 index 0000000..185405e Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_107.png differ diff --git a/common/nori/nori_test/palette.example/animation_108.apng b/common/nori/nori_test/palette.example/animation_108.apng deleted file mode 100755 index f5c1402..0000000 Binary files a/common/nori/nori_test/palette.example/animation_108.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_108.png b/common/nori/nori_test/palette.example/animation_108.png new file mode 100755 index 0000000..b8d5622 Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_108.png differ diff --git a/common/nori/nori_test/palette.example/animation_109.apng b/common/nori/nori_test/palette.example/animation_109.apng deleted file mode 100755 index 1d67258..0000000 Binary files a/common/nori/nori_test/palette.example/animation_109.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_109.png b/common/nori/nori_test/palette.example/animation_109.png new file mode 100755 index 0000000..5b05dc2 Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_109.png differ diff --git a/common/nori/nori_test/palette.example/animation_11.apng b/common/nori/nori_test/palette.example/animation_11.apng deleted file mode 100755 index d1ae19c..0000000 Binary files a/common/nori/nori_test/palette.example/animation_11.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_11.png b/common/nori/nori_test/palette.example/animation_11.png new file mode 100755 index 0000000..9da953f Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_11.png differ diff --git a/common/nori/nori_test/palette.example/animation_110.apng b/common/nori/nori_test/palette.example/animation_110.apng deleted file mode 100755 index bd50934..0000000 Binary files a/common/nori/nori_test/palette.example/animation_110.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_110.png b/common/nori/nori_test/palette.example/animation_110.png new file mode 100755 index 0000000..b4c967d Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_110.png differ diff --git a/common/nori/nori_test/palette.example/animation_111.apng b/common/nori/nori_test/palette.example/animation_111.apng deleted file mode 100755 index 180ab6d..0000000 Binary files a/common/nori/nori_test/palette.example/animation_111.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_111.png b/common/nori/nori_test/palette.example/animation_111.png new file mode 100755 index 0000000..0ce478a Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_111.png differ diff --git a/common/nori/nori_test/palette.example/animation_112.apng b/common/nori/nori_test/palette.example/animation_112.apng deleted file mode 100755 index 0418440..0000000 Binary files a/common/nori/nori_test/palette.example/animation_112.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_112.png b/common/nori/nori_test/palette.example/animation_112.png new file mode 100755 index 0000000..ebbc538 Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_112.png differ diff --git a/common/nori/nori_test/palette.example/animation_113.apng b/common/nori/nori_test/palette.example/animation_113.apng deleted file mode 100755 index e9ec287..0000000 Binary files a/common/nori/nori_test/palette.example/animation_113.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_113.png b/common/nori/nori_test/palette.example/animation_113.png new file mode 100755 index 0000000..21c5693 Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_113.png differ diff --git a/common/nori/nori_test/palette.example/animation_114.apng b/common/nori/nori_test/palette.example/animation_114.apng deleted file mode 100755 index e9ec287..0000000 Binary files a/common/nori/nori_test/palette.example/animation_114.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_114.png b/common/nori/nori_test/palette.example/animation_114.png new file mode 100755 index 0000000..4e9d3e0 Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_114.png differ diff --git a/common/nori/nori_test/palette.example/animation_115.apng b/common/nori/nori_test/palette.example/animation_115.apng deleted file mode 100755 index 0418440..0000000 Binary files a/common/nori/nori_test/palette.example/animation_115.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_115.png b/common/nori/nori_test/palette.example/animation_115.png new file mode 100755 index 0000000..c697bdb Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_115.png differ diff --git a/common/nori/nori_test/palette.example/animation_116.apng b/common/nori/nori_test/palette.example/animation_116.apng deleted file mode 100755 index 77f4284..0000000 Binary files a/common/nori/nori_test/palette.example/animation_116.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_116.png b/common/nori/nori_test/palette.example/animation_116.png new file mode 100755 index 0000000..47d909a Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_116.png differ diff --git a/common/nori/nori_test/palette.example/animation_117.apng b/common/nori/nori_test/palette.example/animation_117.apng deleted file mode 100755 index ca34c01..0000000 Binary files a/common/nori/nori_test/palette.example/animation_117.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_117.png b/common/nori/nori_test/palette.example/animation_117.png new file mode 100755 index 0000000..ff3ed3a Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_117.png differ diff --git a/common/nori/nori_test/palette.example/animation_118.apng b/common/nori/nori_test/palette.example/animation_118.apng deleted file mode 100755 index 387423d..0000000 Binary files a/common/nori/nori_test/palette.example/animation_118.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_118.png b/common/nori/nori_test/palette.example/animation_118.png new file mode 100755 index 0000000..13d9e64 Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_118.png differ diff --git a/common/nori/nori_test/palette.example/animation_119.apng b/common/nori/nori_test/palette.example/animation_119.apng deleted file mode 100755 index 6837b24..0000000 Binary files a/common/nori/nori_test/palette.example/animation_119.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_119.png b/common/nori/nori_test/palette.example/animation_119.png new file mode 100755 index 0000000..c79e75e Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_119.png differ diff --git a/common/nori/nori_test/palette.example/animation_12.apng b/common/nori/nori_test/palette.example/animation_12.apng deleted file mode 100755 index 5b9c9ef..0000000 Binary files a/common/nori/nori_test/palette.example/animation_12.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_12.png b/common/nori/nori_test/palette.example/animation_12.png new file mode 100755 index 0000000..dd2ed69 Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_12.png differ diff --git a/common/nori/nori_test/palette.example/animation_120.apng b/common/nori/nori_test/palette.example/animation_120.apng deleted file mode 100755 index 44100b4..0000000 Binary files a/common/nori/nori_test/palette.example/animation_120.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_120.png b/common/nori/nori_test/palette.example/animation_120.png new file mode 100755 index 0000000..b2aab1d Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_120.png differ diff --git a/common/nori/nori_test/palette.example/animation_121.apng b/common/nori/nori_test/palette.example/animation_121.apng deleted file mode 100755 index 993ec75..0000000 Binary files a/common/nori/nori_test/palette.example/animation_121.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_121.png b/common/nori/nori_test/palette.example/animation_121.png new file mode 100755 index 0000000..77fe832 Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_121.png differ diff --git a/common/nori/nori_test/palette.example/animation_122.apng b/common/nori/nori_test/palette.example/animation_122.apng deleted file mode 100755 index 2ffe3dd..0000000 Binary files a/common/nori/nori_test/palette.example/animation_122.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_122.png b/common/nori/nori_test/palette.example/animation_122.png new file mode 100755 index 0000000..32d96f8 Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_122.png differ diff --git a/common/nori/nori_test/palette.example/animation_123.apng b/common/nori/nori_test/palette.example/animation_123.apng deleted file mode 100755 index bc978be..0000000 Binary files a/common/nori/nori_test/palette.example/animation_123.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_123.png b/common/nori/nori_test/palette.example/animation_123.png new file mode 100755 index 0000000..80b1658 Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_123.png differ diff --git a/common/nori/nori_test/palette.example/animation_124.apng b/common/nori/nori_test/palette.example/animation_124.png similarity index 100% rename from common/nori/nori_test/palette.example/animation_124.apng rename to common/nori/nori_test/palette.example/animation_124.png diff --git a/common/nori/nori_test/palette.example/animation_125.apng b/common/nori/nori_test/palette.example/animation_125.png similarity index 100% rename from common/nori/nori_test/palette.example/animation_125.apng rename to common/nori/nori_test/palette.example/animation_125.png diff --git a/common/nori/nori_test/palette.example/animation_126.apng b/common/nori/nori_test/palette.example/animation_126.png similarity index 100% rename from common/nori/nori_test/palette.example/animation_126.apng rename to common/nori/nori_test/palette.example/animation_126.png diff --git a/common/nori/nori_test/palette.example/animation_127.apng b/common/nori/nori_test/palette.example/animation_127.png similarity index 100% rename from common/nori/nori_test/palette.example/animation_127.apng rename to common/nori/nori_test/palette.example/animation_127.png diff --git a/common/nori/nori_test/palette.example/animation_128.apng b/common/nori/nori_test/palette.example/animation_128.png similarity index 100% rename from common/nori/nori_test/palette.example/animation_128.apng rename to common/nori/nori_test/palette.example/animation_128.png diff --git a/common/nori/nori_test/palette.example/animation_129.apng b/common/nori/nori_test/palette.example/animation_129.png similarity index 100% rename from common/nori/nori_test/palette.example/animation_129.apng rename to common/nori/nori_test/palette.example/animation_129.png diff --git a/common/nori/nori_test/palette.example/animation_13.apng b/common/nori/nori_test/palette.example/animation_13.apng deleted file mode 100755 index eed03a2..0000000 Binary files a/common/nori/nori_test/palette.example/animation_13.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_13.png b/common/nori/nori_test/palette.example/animation_13.png new file mode 100755 index 0000000..6f20b9c Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_13.png differ diff --git a/common/nori/nori_test/palette.example/animation_130.apng b/common/nori/nori_test/palette.example/animation_130.png similarity index 100% rename from common/nori/nori_test/palette.example/animation_130.apng rename to common/nori/nori_test/palette.example/animation_130.png diff --git a/common/nori/nori_test/palette.example/animation_131.apng b/common/nori/nori_test/palette.example/animation_131.png similarity index 100% rename from common/nori/nori_test/palette.example/animation_131.apng rename to common/nori/nori_test/palette.example/animation_131.png diff --git a/common/nori/nori_test/palette.example/animation_132.apng b/common/nori/nori_test/palette.example/animation_132.png similarity index 100% rename from common/nori/nori_test/palette.example/animation_132.apng rename to common/nori/nori_test/palette.example/animation_132.png diff --git a/common/nori/nori_test/palette.example/animation_133.apng b/common/nori/nori_test/palette.example/animation_133.apng deleted file mode 100755 index baef190..0000000 Binary files a/common/nori/nori_test/palette.example/animation_133.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_133.png b/common/nori/nori_test/palette.example/animation_133.png new file mode 100755 index 0000000..9a0377c Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_133.png differ diff --git a/common/nori/nori_test/palette.example/animation_134.apng b/common/nori/nori_test/palette.example/animation_134.apng deleted file mode 100755 index 380502d..0000000 Binary files a/common/nori/nori_test/palette.example/animation_134.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_134.png b/common/nori/nori_test/palette.example/animation_134.png new file mode 100755 index 0000000..76c4037 Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_134.png differ diff --git a/common/nori/nori_test/palette.example/animation_135.apng b/common/nori/nori_test/palette.example/animation_135.apng deleted file mode 100755 index 380502d..0000000 Binary files a/common/nori/nori_test/palette.example/animation_135.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_135.png b/common/nori/nori_test/palette.example/animation_135.png new file mode 100755 index 0000000..2a0c9b9 Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_135.png differ diff --git a/common/nori/nori_test/palette.example/animation_136.apng b/common/nori/nori_test/palette.example/animation_136.apng deleted file mode 100755 index baef190..0000000 Binary files a/common/nori/nori_test/palette.example/animation_136.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_136.png b/common/nori/nori_test/palette.example/animation_136.png new file mode 100755 index 0000000..04c62bb Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_136.png differ diff --git a/common/nori/nori_test/palette.example/animation_137.apng b/common/nori/nori_test/palette.example/animation_137.png similarity index 100% rename from common/nori/nori_test/palette.example/animation_137.apng rename to common/nori/nori_test/palette.example/animation_137.png diff --git a/common/nori/nori_test/palette.example/animation_138.apng b/common/nori/nori_test/palette.example/animation_138.png similarity index 100% rename from common/nori/nori_test/palette.example/animation_138.apng rename to common/nori/nori_test/palette.example/animation_138.png diff --git a/common/nori/nori_test/palette.example/animation_139.apng b/common/nori/nori_test/palette.example/animation_139.png similarity index 100% rename from common/nori/nori_test/palette.example/animation_139.apng rename to common/nori/nori_test/palette.example/animation_139.png diff --git a/common/nori/nori_test/palette.example/animation_14.apng b/common/nori/nori_test/palette.example/animation_14.apng deleted file mode 100755 index eaad617..0000000 Binary files a/common/nori/nori_test/palette.example/animation_14.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_14.png b/common/nori/nori_test/palette.example/animation_14.png new file mode 100755 index 0000000..dc12f44 Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_14.png differ diff --git a/common/nori/nori_test/palette.example/animation_140.apng b/common/nori/nori_test/palette.example/animation_140.png similarity index 100% rename from common/nori/nori_test/palette.example/animation_140.apng rename to common/nori/nori_test/palette.example/animation_140.png diff --git a/common/nori/nori_test/palette.example/animation_15.apng b/common/nori/nori_test/palette.example/animation_15.apng deleted file mode 100755 index 03c4dd5..0000000 Binary files a/common/nori/nori_test/palette.example/animation_15.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_15.png b/common/nori/nori_test/palette.example/animation_15.png new file mode 100755 index 0000000..33f3f4b Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_15.png differ diff --git a/common/nori/nori_test/palette.example/animation_157.apng b/common/nori/nori_test/palette.example/animation_157.png similarity index 100% rename from common/nori/nori_test/palette.example/animation_157.apng rename to common/nori/nori_test/palette.example/animation_157.png diff --git a/common/nori/nori_test/palette.example/animation_158.apng b/common/nori/nori_test/palette.example/animation_158.png similarity index 100% rename from common/nori/nori_test/palette.example/animation_158.apng rename to common/nori/nori_test/palette.example/animation_158.png diff --git a/common/nori/nori_test/palette.example/animation_159.apng b/common/nori/nori_test/palette.example/animation_159.png similarity index 100% rename from common/nori/nori_test/palette.example/animation_159.apng rename to common/nori/nori_test/palette.example/animation_159.png diff --git a/common/nori/nori_test/palette.example/animation_16.png b/common/nori/nori_test/palette.example/animation_16.png new file mode 100755 index 0000000..ac1c72a Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_16.png differ diff --git a/common/nori/nori_test/palette.example/animation_160.apng b/common/nori/nori_test/palette.example/animation_160.png similarity index 100% rename from common/nori/nori_test/palette.example/animation_160.apng rename to common/nori/nori_test/palette.example/animation_160.png diff --git a/common/nori/nori_test/palette.example/animation_161.apng b/common/nori/nori_test/palette.example/animation_161.png similarity index 100% rename from common/nori/nori_test/palette.example/animation_161.apng rename to common/nori/nori_test/palette.example/animation_161.png diff --git a/common/nori/nori_test/palette.example/animation_162.apng b/common/nori/nori_test/palette.example/animation_162.png similarity index 100% rename from common/nori/nori_test/palette.example/animation_162.apng rename to common/nori/nori_test/palette.example/animation_162.png diff --git a/common/nori/nori_test/palette.example/animation_163.apng b/common/nori/nori_test/palette.example/animation_163.png similarity index 100% rename from common/nori/nori_test/palette.example/animation_163.apng rename to common/nori/nori_test/palette.example/animation_163.png diff --git a/common/nori/nori_test/palette.example/animation_166.apng b/common/nori/nori_test/palette.example/animation_166.png similarity index 100% rename from common/nori/nori_test/palette.example/animation_166.apng rename to common/nori/nori_test/palette.example/animation_166.png diff --git a/common/nori/nori_test/palette.example/animation_17.apng b/common/nori/nori_test/palette.example/animation_17.apng deleted file mode 100755 index 0f492ee..0000000 Binary files a/common/nori/nori_test/palette.example/animation_17.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_17.png b/common/nori/nori_test/palette.example/animation_17.png new file mode 100755 index 0000000..845100e Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_17.png differ diff --git a/common/nori/nori_test/palette.example/animation_18.apng b/common/nori/nori_test/palette.example/animation_18.png similarity index 55% rename from common/nori/nori_test/palette.example/animation_18.apng rename to common/nori/nori_test/palette.example/animation_18.png index 0f492ee..7273376 100755 Binary files a/common/nori/nori_test/palette.example/animation_18.apng and b/common/nori/nori_test/palette.example/animation_18.png differ diff --git a/common/nori/nori_test/palette.example/animation_19.apng b/common/nori/nori_test/palette.example/animation_19.apng deleted file mode 100755 index 7f42f01..0000000 Binary files a/common/nori/nori_test/palette.example/animation_19.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_16.apng b/common/nori/nori_test/palette.example/animation_19.png similarity index 66% rename from common/nori/nori_test/palette.example/animation_16.apng rename to common/nori/nori_test/palette.example/animation_19.png index 7f42f01..b0b6081 100755 Binary files a/common/nori/nori_test/palette.example/animation_16.apng and b/common/nori/nori_test/palette.example/animation_19.png differ diff --git a/common/nori/nori_test/palette.example/animation_2.apng b/common/nori/nori_test/palette.example/animation_2.png similarity index 100% rename from common/nori/nori_test/palette.example/animation_2.apng rename to common/nori/nori_test/palette.example/animation_2.png diff --git a/common/nori/nori_test/palette.example/animation_20.apng b/common/nori/nori_test/palette.example/animation_20.png similarity index 100% rename from common/nori/nori_test/palette.example/animation_20.apng rename to common/nori/nori_test/palette.example/animation_20.png diff --git a/common/nori/nori_test/palette.example/animation_21.apng b/common/nori/nori_test/palette.example/animation_21.png similarity index 100% rename from common/nori/nori_test/palette.example/animation_21.apng rename to common/nori/nori_test/palette.example/animation_21.png diff --git a/common/nori/nori_test/palette.example/animation_22.apng b/common/nori/nori_test/palette.example/animation_22.png similarity index 100% rename from common/nori/nori_test/palette.example/animation_22.apng rename to common/nori/nori_test/palette.example/animation_22.png diff --git a/common/nori/nori_test/palette.example/animation_23.png b/common/nori/nori_test/palette.example/animation_23.png new file mode 100755 index 0000000..3d0af5d Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_23.png differ diff --git a/common/nori/nori_test/palette.example/animation_24.apng b/common/nori/nori_test/palette.example/animation_24.apng deleted file mode 100755 index 7e40a52..0000000 Binary files a/common/nori/nori_test/palette.example/animation_24.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_23.apng b/common/nori/nori_test/palette.example/animation_24.png similarity index 100% rename from common/nori/nori_test/palette.example/animation_23.apng rename to common/nori/nori_test/palette.example/animation_24.png diff --git a/common/nori/nori_test/palette.example/animation_25.apng b/common/nori/nori_test/palette.example/animation_25.png similarity index 100% rename from common/nori/nori_test/palette.example/animation_25.apng rename to common/nori/nori_test/palette.example/animation_25.png diff --git a/common/nori/nori_test/palette.example/animation_26.apng b/common/nori/nori_test/palette.example/animation_26.apng deleted file mode 100755 index f84062a..0000000 Binary files a/common/nori/nori_test/palette.example/animation_26.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_26.png b/common/nori/nori_test/palette.example/animation_26.png new file mode 100755 index 0000000..94729d0 Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_26.png differ diff --git a/common/nori/nori_test/palette.example/animation_27.apng b/common/nori/nori_test/palette.example/animation_27.apng deleted file mode 100755 index c2c24fc..0000000 Binary files a/common/nori/nori_test/palette.example/animation_27.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_27.png b/common/nori/nori_test/palette.example/animation_27.png new file mode 100755 index 0000000..f1600d9 Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_27.png differ diff --git a/common/nori/nori_test/palette.example/animation_28.apng b/common/nori/nori_test/palette.example/animation_28.apng deleted file mode 100755 index c2c24fc..0000000 Binary files a/common/nori/nori_test/palette.example/animation_28.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_28.png b/common/nori/nori_test/palette.example/animation_28.png new file mode 100755 index 0000000..eaeea24 Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_28.png differ diff --git a/common/nori/nori_test/palette.example/animation_29.apng b/common/nori/nori_test/palette.example/animation_29.apng deleted file mode 100755 index f84062a..0000000 Binary files a/common/nori/nori_test/palette.example/animation_29.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_29.png b/common/nori/nori_test/palette.example/animation_29.png new file mode 100755 index 0000000..e924893 Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_29.png differ diff --git a/common/nori/nori_test/palette.example/animation_3.apng b/common/nori/nori_test/palette.example/animation_3.png similarity index 100% rename from common/nori/nori_test/palette.example/animation_3.apng rename to common/nori/nori_test/palette.example/animation_3.png diff --git a/common/nori/nori_test/palette.example/animation_30.apng b/common/nori/nori_test/palette.example/animation_30.apng deleted file mode 100755 index b847f23..0000000 Binary files a/common/nori/nori_test/palette.example/animation_30.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_30.png b/common/nori/nori_test/palette.example/animation_30.png new file mode 100755 index 0000000..e55987a Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_30.png differ diff --git a/common/nori/nori_test/palette.example/animation_31.apng b/common/nori/nori_test/palette.example/animation_31.png similarity index 83% rename from common/nori/nori_test/palette.example/animation_31.apng rename to common/nori/nori_test/palette.example/animation_31.png index f7ed2e1..5275633 100755 Binary files a/common/nori/nori_test/palette.example/animation_31.apng and b/common/nori/nori_test/palette.example/animation_31.png differ diff --git a/common/nori/nori_test/palette.example/animation_32.apng b/common/nori/nori_test/palette.example/animation_32.png similarity index 83% rename from common/nori/nori_test/palette.example/animation_32.apng rename to common/nori/nori_test/palette.example/animation_32.png index f7ed2e1..bad76f4 100755 Binary files a/common/nori/nori_test/palette.example/animation_32.apng and b/common/nori/nori_test/palette.example/animation_32.png differ diff --git a/common/nori/nori_test/palette.example/animation_33.apng b/common/nori/nori_test/palette.example/animation_33.png similarity index 81% rename from common/nori/nori_test/palette.example/animation_33.apng rename to common/nori/nori_test/palette.example/animation_33.png index b847f23..cf7edc3 100755 Binary files a/common/nori/nori_test/palette.example/animation_33.apng and b/common/nori/nori_test/palette.example/animation_33.png differ diff --git a/common/nori/nori_test/palette.example/animation_34.apng b/common/nori/nori_test/palette.example/animation_34.apng deleted file mode 100755 index 6f82bb1..0000000 Binary files a/common/nori/nori_test/palette.example/animation_34.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_34.png b/common/nori/nori_test/palette.example/animation_34.png new file mode 100755 index 0000000..bdd1c47 Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_34.png differ diff --git a/common/nori/nori_test/palette.example/animation_35.apng b/common/nori/nori_test/palette.example/animation_35.apng deleted file mode 100755 index 6f82bb1..0000000 Binary files a/common/nori/nori_test/palette.example/animation_35.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_35.png b/common/nori/nori_test/palette.example/animation_35.png new file mode 100755 index 0000000..1d76540 Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_35.png differ diff --git a/common/nori/nori_test/palette.example/animation_36.apng b/common/nori/nori_test/palette.example/animation_36.apng deleted file mode 100755 index f43295b..0000000 Binary files a/common/nori/nori_test/palette.example/animation_36.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_36.png b/common/nori/nori_test/palette.example/animation_36.png new file mode 100755 index 0000000..281eafa Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_36.png differ diff --git a/common/nori/nori_test/palette.example/animation_37.apng b/common/nori/nori_test/palette.example/animation_37.apng deleted file mode 100755 index cc45f0b..0000000 Binary files a/common/nori/nori_test/palette.example/animation_37.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_37.png b/common/nori/nori_test/palette.example/animation_37.png new file mode 100755 index 0000000..f24604b Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_37.png differ diff --git a/common/nori/nori_test/palette.example/animation_38.apng b/common/nori/nori_test/palette.example/animation_38.apng deleted file mode 100755 index f43295b..0000000 Binary files a/common/nori/nori_test/palette.example/animation_38.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_38.png b/common/nori/nori_test/palette.example/animation_38.png new file mode 100755 index 0000000..281eafa Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_38.png differ diff --git a/common/nori/nori_test/palette.example/animation_39.apng b/common/nori/nori_test/palette.example/animation_39.apng deleted file mode 100755 index cc45f0b..0000000 Binary files a/common/nori/nori_test/palette.example/animation_39.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_39.png b/common/nori/nori_test/palette.example/animation_39.png new file mode 100755 index 0000000..f24604b Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_39.png differ diff --git a/common/nori/nori_test/palette.example/animation_4.apng b/common/nori/nori_test/palette.example/animation_4.png similarity index 100% rename from common/nori/nori_test/palette.example/animation_4.apng rename to common/nori/nori_test/palette.example/animation_4.png diff --git a/common/nori/nori_test/palette.example/animation_40.apng b/common/nori/nori_test/palette.example/animation_40.apng deleted file mode 100755 index f43295b..0000000 Binary files a/common/nori/nori_test/palette.example/animation_40.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_40.png b/common/nori/nori_test/palette.example/animation_40.png new file mode 100755 index 0000000..281eafa Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_40.png differ diff --git a/common/nori/nori_test/palette.example/animation_41.apng b/common/nori/nori_test/palette.example/animation_41.apng deleted file mode 100755 index cc45f0b..0000000 Binary files a/common/nori/nori_test/palette.example/animation_41.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_41.png b/common/nori/nori_test/palette.example/animation_41.png new file mode 100755 index 0000000..f24604b Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_41.png differ diff --git a/common/nori/nori_test/palette.example/animation_42.apng b/common/nori/nori_test/palette.example/animation_42.apng deleted file mode 100755 index f43295b..0000000 Binary files a/common/nori/nori_test/palette.example/animation_42.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_42.png b/common/nori/nori_test/palette.example/animation_42.png new file mode 100755 index 0000000..281eafa Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_42.png differ diff --git a/common/nori/nori_test/palette.example/animation_43.apng b/common/nori/nori_test/palette.example/animation_43.apng deleted file mode 100755 index cc45f0b..0000000 Binary files a/common/nori/nori_test/palette.example/animation_43.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_43.png b/common/nori/nori_test/palette.example/animation_43.png new file mode 100755 index 0000000..f24604b Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_43.png differ diff --git a/common/nori/nori_test/palette.example/animation_44.apng b/common/nori/nori_test/palette.example/animation_44.apng deleted file mode 100755 index f43295b..0000000 Binary files a/common/nori/nori_test/palette.example/animation_44.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_44.png b/common/nori/nori_test/palette.example/animation_44.png new file mode 100755 index 0000000..281eafa Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_44.png differ diff --git a/common/nori/nori_test/palette.example/animation_45.apng b/common/nori/nori_test/palette.example/animation_45.apng deleted file mode 100755 index cc45f0b..0000000 Binary files a/common/nori/nori_test/palette.example/animation_45.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_45.png b/common/nori/nori_test/palette.example/animation_45.png new file mode 100755 index 0000000..f24604b Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_45.png differ diff --git a/common/nori/nori_test/palette.example/animation_46.apng b/common/nori/nori_test/palette.example/animation_46.apng deleted file mode 100755 index f43295b..0000000 Binary files a/common/nori/nori_test/palette.example/animation_46.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_46.png b/common/nori/nori_test/palette.example/animation_46.png new file mode 100755 index 0000000..281eafa Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_46.png differ diff --git a/common/nori/nori_test/palette.example/animation_47.apng b/common/nori/nori_test/palette.example/animation_47.apng deleted file mode 100755 index cc45f0b..0000000 Binary files a/common/nori/nori_test/palette.example/animation_47.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_47.png b/common/nori/nori_test/palette.example/animation_47.png new file mode 100755 index 0000000..f24604b Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_47.png differ diff --git a/common/nori/nori_test/palette.example/animation_48.apng b/common/nori/nori_test/palette.example/animation_48.apng deleted file mode 100755 index f43295b..0000000 Binary files a/common/nori/nori_test/palette.example/animation_48.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_48.png b/common/nori/nori_test/palette.example/animation_48.png new file mode 100755 index 0000000..281eafa Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_48.png differ diff --git a/common/nori/nori_test/palette.example/animation_49.apng b/common/nori/nori_test/palette.example/animation_49.apng deleted file mode 100755 index cc45f0b..0000000 Binary files a/common/nori/nori_test/palette.example/animation_49.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_49.png b/common/nori/nori_test/palette.example/animation_49.png new file mode 100755 index 0000000..f24604b Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_49.png differ diff --git a/common/nori/nori_test/palette.example/animation_5.apng b/common/nori/nori_test/palette.example/animation_5.png similarity index 100% rename from common/nori/nori_test/palette.example/animation_5.apng rename to common/nori/nori_test/palette.example/animation_5.png diff --git a/common/nori/nori_test/palette.example/animation_50.apng b/common/nori/nori_test/palette.example/animation_50.apng deleted file mode 100755 index f43295b..0000000 Binary files a/common/nori/nori_test/palette.example/animation_50.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_50.png b/common/nori/nori_test/palette.example/animation_50.png new file mode 100755 index 0000000..281eafa Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_50.png differ diff --git a/common/nori/nori_test/palette.example/animation_51.apng b/common/nori/nori_test/palette.example/animation_51.apng deleted file mode 100755 index cc45f0b..0000000 Binary files a/common/nori/nori_test/palette.example/animation_51.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_51.png b/common/nori/nori_test/palette.example/animation_51.png new file mode 100755 index 0000000..f24604b Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_51.png differ diff --git a/common/nori/nori_test/palette.example/animation_52.apng b/common/nori/nori_test/palette.example/animation_52.apng deleted file mode 100755 index f43295b..0000000 Binary files a/common/nori/nori_test/palette.example/animation_52.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_52.png b/common/nori/nori_test/palette.example/animation_52.png new file mode 100755 index 0000000..281eafa Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_52.png differ diff --git a/common/nori/nori_test/palette.example/animation_53.apng b/common/nori/nori_test/palette.example/animation_53.apng deleted file mode 100755 index cc45f0b..0000000 Binary files a/common/nori/nori_test/palette.example/animation_53.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_53.png b/common/nori/nori_test/palette.example/animation_53.png new file mode 100755 index 0000000..f24604b Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_53.png differ diff --git a/common/nori/nori_test/palette.example/animation_54.apng b/common/nori/nori_test/palette.example/animation_54.apng deleted file mode 100755 index 64c82f8..0000000 Binary files a/common/nori/nori_test/palette.example/animation_54.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_54.png b/common/nori/nori_test/palette.example/animation_54.png new file mode 100755 index 0000000..7edbf93 Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_54.png differ diff --git a/common/nori/nori_test/palette.example/animation_55.apng b/common/nori/nori_test/palette.example/animation_55.apng deleted file mode 100755 index 64c82f8..0000000 Binary files a/common/nori/nori_test/palette.example/animation_55.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_55.png b/common/nori/nori_test/palette.example/animation_55.png new file mode 100755 index 0000000..762fb4a Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_55.png differ diff --git a/common/nori/nori_test/palette.example/animation_56.apng b/common/nori/nori_test/palette.example/animation_56.apng deleted file mode 100755 index 4cd7f89..0000000 Binary files a/common/nori/nori_test/palette.example/animation_56.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_56.png b/common/nori/nori_test/palette.example/animation_56.png new file mode 100755 index 0000000..b2a45c2 Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_56.png differ diff --git a/common/nori/nori_test/palette.example/animation_57.apng b/common/nori/nori_test/palette.example/animation_57.apng deleted file mode 100755 index 4cd7f89..0000000 Binary files a/common/nori/nori_test/palette.example/animation_57.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_57.png b/common/nori/nori_test/palette.example/animation_57.png new file mode 100755 index 0000000..1943010 Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_57.png differ diff --git a/common/nori/nori_test/palette.example/animation_58.apng b/common/nori/nori_test/palette.example/animation_58.apng deleted file mode 100755 index 54dbc79..0000000 Binary files a/common/nori/nori_test/palette.example/animation_58.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_58.png b/common/nori/nori_test/palette.example/animation_58.png new file mode 100755 index 0000000..7a9b149 Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_58.png differ diff --git a/common/nori/nori_test/palette.example/animation_59.apng b/common/nori/nori_test/palette.example/animation_59.apng deleted file mode 100755 index 54dbc79..0000000 Binary files a/common/nori/nori_test/palette.example/animation_59.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_59.png b/common/nori/nori_test/palette.example/animation_59.png new file mode 100755 index 0000000..91eed33 Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_59.png differ diff --git a/common/nori/nori_test/palette.example/animation_6.apng b/common/nori/nori_test/palette.example/animation_6.png similarity index 100% rename from common/nori/nori_test/palette.example/animation_6.apng rename to common/nori/nori_test/palette.example/animation_6.png diff --git a/common/nori/nori_test/palette.example/animation_60.apng b/common/nori/nori_test/palette.example/animation_60.apng deleted file mode 100755 index cdc9b01..0000000 Binary files a/common/nori/nori_test/palette.example/animation_60.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_60.png b/common/nori/nori_test/palette.example/animation_60.png new file mode 100755 index 0000000..1d81370 Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_60.png differ diff --git a/common/nori/nori_test/palette.example/animation_61.apng b/common/nori/nori_test/palette.example/animation_61.apng deleted file mode 100755 index 71cab74..0000000 Binary files a/common/nori/nori_test/palette.example/animation_61.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_61.png b/common/nori/nori_test/palette.example/animation_61.png new file mode 100755 index 0000000..bb3694a Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_61.png differ diff --git a/common/nori/nori_test/palette.example/animation_62.apng b/common/nori/nori_test/palette.example/animation_62.apng deleted file mode 100755 index 71cab74..0000000 Binary files a/common/nori/nori_test/palette.example/animation_62.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_62.png b/common/nori/nori_test/palette.example/animation_62.png new file mode 100755 index 0000000..f0f07f4 Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_62.png differ diff --git a/common/nori/nori_test/palette.example/animation_63.apng b/common/nori/nori_test/palette.example/animation_63.apng deleted file mode 100755 index cdc9b01..0000000 Binary files a/common/nori/nori_test/palette.example/animation_63.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_63.png b/common/nori/nori_test/palette.example/animation_63.png new file mode 100755 index 0000000..ef0526a Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_63.png differ diff --git a/common/nori/nori_test/palette.example/animation_64.apng b/common/nori/nori_test/palette.example/animation_64.png similarity index 100% rename from common/nori/nori_test/palette.example/animation_64.apng rename to common/nori/nori_test/palette.example/animation_64.png diff --git a/common/nori/nori_test/palette.example/animation_65.apng b/common/nori/nori_test/palette.example/animation_65.png similarity index 100% rename from common/nori/nori_test/palette.example/animation_65.apng rename to common/nori/nori_test/palette.example/animation_65.png diff --git a/common/nori/nori_test/palette.example/animation_66.apng b/common/nori/nori_test/palette.example/animation_66.png similarity index 100% rename from common/nori/nori_test/palette.example/animation_66.apng rename to common/nori/nori_test/palette.example/animation_66.png diff --git a/common/nori/nori_test/palette.example/animation_67.apng b/common/nori/nori_test/palette.example/animation_67.png similarity index 100% rename from common/nori/nori_test/palette.example/animation_67.apng rename to common/nori/nori_test/palette.example/animation_67.png diff --git a/common/nori/nori_test/palette.example/animation_68.apng b/common/nori/nori_test/palette.example/animation_68.png similarity index 100% rename from common/nori/nori_test/palette.example/animation_68.apng rename to common/nori/nori_test/palette.example/animation_68.png diff --git a/common/nori/nori_test/palette.example/animation_69.apng b/common/nori/nori_test/palette.example/animation_69.png similarity index 100% rename from common/nori/nori_test/palette.example/animation_69.apng rename to common/nori/nori_test/palette.example/animation_69.png diff --git a/common/nori/nori_test/palette.example/animation_7.apng b/common/nori/nori_test/palette.example/animation_7.png similarity index 100% rename from common/nori/nori_test/palette.example/animation_7.apng rename to common/nori/nori_test/palette.example/animation_7.png diff --git a/common/nori/nori_test/palette.example/animation_70.apng b/common/nori/nori_test/palette.example/animation_70.png similarity index 100% rename from common/nori/nori_test/palette.example/animation_70.apng rename to common/nori/nori_test/palette.example/animation_70.png diff --git a/common/nori/nori_test/palette.example/animation_71.apng b/common/nori/nori_test/palette.example/animation_71.png similarity index 100% rename from common/nori/nori_test/palette.example/animation_71.apng rename to common/nori/nori_test/palette.example/animation_71.png diff --git a/common/nori/nori_test/palette.example/animation_72.apng b/common/nori/nori_test/palette.example/animation_72.png similarity index 100% rename from common/nori/nori_test/palette.example/animation_72.apng rename to common/nori/nori_test/palette.example/animation_72.png diff --git a/common/nori/nori_test/palette.example/animation_73.apng b/common/nori/nori_test/palette.example/animation_73.png similarity index 100% rename from common/nori/nori_test/palette.example/animation_73.apng rename to common/nori/nori_test/palette.example/animation_73.png diff --git a/common/nori/nori_test/palette.example/animation_74.apng b/common/nori/nori_test/palette.example/animation_74.png similarity index 100% rename from common/nori/nori_test/palette.example/animation_74.apng rename to common/nori/nori_test/palette.example/animation_74.png diff --git a/common/nori/nori_test/palette.example/animation_75.apng b/common/nori/nori_test/palette.example/animation_75.png similarity index 100% rename from common/nori/nori_test/palette.example/animation_75.apng rename to common/nori/nori_test/palette.example/animation_75.png diff --git a/common/nori/nori_test/palette.example/animation_76.apng b/common/nori/nori_test/palette.example/animation_76.apng deleted file mode 100755 index f822461..0000000 Binary files a/common/nori/nori_test/palette.example/animation_76.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_76.png b/common/nori/nori_test/palette.example/animation_76.png new file mode 100755 index 0000000..c2d8500 Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_76.png differ diff --git a/common/nori/nori_test/palette.example/animation_77.png b/common/nori/nori_test/palette.example/animation_77.png new file mode 100755 index 0000000..060328d Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_77.png differ diff --git a/common/nori/nori_test/palette.example/animation_78.apng b/common/nori/nori_test/palette.example/animation_78.apng deleted file mode 100755 index 447c957..0000000 Binary files a/common/nori/nori_test/palette.example/animation_78.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_77.apng b/common/nori/nori_test/palette.example/animation_78.png similarity index 100% rename from common/nori/nori_test/palette.example/animation_77.apng rename to common/nori/nori_test/palette.example/animation_78.png diff --git a/common/nori/nori_test/palette.example/animation_79.apng b/common/nori/nori_test/palette.example/animation_79.apng deleted file mode 100755 index f822461..0000000 Binary files a/common/nori/nori_test/palette.example/animation_79.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_79.png b/common/nori/nori_test/palette.example/animation_79.png new file mode 100755 index 0000000..9759620 Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_79.png differ diff --git a/common/nori/nori_test/palette.example/animation_8.apng b/common/nori/nori_test/palette.example/animation_8.apng deleted file mode 100755 index 3883352..0000000 Binary files a/common/nori/nori_test/palette.example/animation_8.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_8.png b/common/nori/nori_test/palette.example/animation_8.png new file mode 100755 index 0000000..c049102 Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_8.png differ diff --git a/common/nori/nori_test/palette.example/animation_80.apng b/common/nori/nori_test/palette.example/animation_80.apng deleted file mode 100755 index 796f05b..0000000 Binary files a/common/nori/nori_test/palette.example/animation_80.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_80.png b/common/nori/nori_test/palette.example/animation_80.png new file mode 100755 index 0000000..ce08ca7 Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_80.png differ diff --git a/common/nori/nori_test/palette.example/animation_81.apng b/common/nori/nori_test/palette.example/animation_81.apng deleted file mode 100755 index 45e7e8d..0000000 Binary files a/common/nori/nori_test/palette.example/animation_81.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_81.png b/common/nori/nori_test/palette.example/animation_81.png new file mode 100755 index 0000000..d3b4baa Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_81.png differ diff --git a/common/nori/nori_test/palette.example/animation_82.apng b/common/nori/nori_test/palette.example/animation_82.apng deleted file mode 100755 index 45e7e8d..0000000 Binary files a/common/nori/nori_test/palette.example/animation_82.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_82.png b/common/nori/nori_test/palette.example/animation_82.png new file mode 100755 index 0000000..f102e7c Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_82.png differ diff --git a/common/nori/nori_test/palette.example/animation_83.apng b/common/nori/nori_test/palette.example/animation_83.apng deleted file mode 100755 index 796f05b..0000000 Binary files a/common/nori/nori_test/palette.example/animation_83.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_83.png b/common/nori/nori_test/palette.example/animation_83.png new file mode 100755 index 0000000..5148ccc Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_83.png differ diff --git a/common/nori/nori_test/palette.example/animation_84.apng b/common/nori/nori_test/palette.example/animation_84.apng deleted file mode 100755 index a07d055..0000000 Binary files a/common/nori/nori_test/palette.example/animation_84.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_84.png b/common/nori/nori_test/palette.example/animation_84.png new file mode 100755 index 0000000..14ffc64 Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_84.png differ diff --git a/common/nori/nori_test/palette.example/animation_85.apng b/common/nori/nori_test/palette.example/animation_85.apng deleted file mode 100755 index 6948be7..0000000 Binary files a/common/nori/nori_test/palette.example/animation_85.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_85.png b/common/nori/nori_test/palette.example/animation_85.png new file mode 100755 index 0000000..7233425 Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_85.png differ diff --git a/common/nori/nori_test/palette.example/animation_86.apng b/common/nori/nori_test/palette.example/animation_86.apng deleted file mode 100755 index 6948be7..0000000 Binary files a/common/nori/nori_test/palette.example/animation_86.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_86.png b/common/nori/nori_test/palette.example/animation_86.png new file mode 100755 index 0000000..c32e027 Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_86.png differ diff --git a/common/nori/nori_test/palette.example/animation_87.apng b/common/nori/nori_test/palette.example/animation_87.apng deleted file mode 100755 index a07d055..0000000 Binary files a/common/nori/nori_test/palette.example/animation_87.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_87.png b/common/nori/nori_test/palette.example/animation_87.png new file mode 100755 index 0000000..6b0a347 Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_87.png differ diff --git a/common/nori/nori_test/palette.example/animation_88.apng b/common/nori/nori_test/palette.example/animation_88.apng deleted file mode 100755 index de62d8f..0000000 Binary files a/common/nori/nori_test/palette.example/animation_88.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_88.png b/common/nori/nori_test/palette.example/animation_88.png new file mode 100755 index 0000000..7d8e503 Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_88.png differ diff --git a/common/nori/nori_test/palette.example/animation_89.apng b/common/nori/nori_test/palette.example/animation_89.apng deleted file mode 100755 index 6d54b76..0000000 Binary files a/common/nori/nori_test/palette.example/animation_89.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_89.png b/common/nori/nori_test/palette.example/animation_89.png new file mode 100755 index 0000000..8684bf1 Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_89.png differ diff --git a/common/nori/nori_test/palette.example/animation_9.apng b/common/nori/nori_test/palette.example/animation_9.apng deleted file mode 100755 index b32c48b..0000000 Binary files a/common/nori/nori_test/palette.example/animation_9.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_9.png b/common/nori/nori_test/palette.example/animation_9.png new file mode 100755 index 0000000..ee3057d Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_9.png differ diff --git a/common/nori/nori_test/palette.example/animation_90.apng b/common/nori/nori_test/palette.example/animation_90.apng deleted file mode 100755 index 4e828f5..0000000 Binary files a/common/nori/nori_test/palette.example/animation_90.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_90.png b/common/nori/nori_test/palette.example/animation_90.png new file mode 100755 index 0000000..7407850 Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_90.png differ diff --git a/common/nori/nori_test/palette.example/animation_91.apng b/common/nori/nori_test/palette.example/animation_91.apng deleted file mode 100755 index 3790149..0000000 Binary files a/common/nori/nori_test/palette.example/animation_91.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_91.png b/common/nori/nori_test/palette.example/animation_91.png new file mode 100755 index 0000000..d7b555c Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_91.png differ diff --git a/common/nori/nori_test/palette.example/animation_92.apng b/common/nori/nori_test/palette.example/animation_92.apng deleted file mode 100755 index 7985a02..0000000 Binary files a/common/nori/nori_test/palette.example/animation_92.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_92.png b/common/nori/nori_test/palette.example/animation_92.png new file mode 100755 index 0000000..09c4801 Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_92.png differ diff --git a/common/nori/nori_test/palette.example/animation_93.apng b/common/nori/nori_test/palette.example/animation_93.apng deleted file mode 100755 index a07a489..0000000 Binary files a/common/nori/nori_test/palette.example/animation_93.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_93.png b/common/nori/nori_test/palette.example/animation_93.png new file mode 100755 index 0000000..8056603 Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_93.png differ diff --git a/common/nori/nori_test/palette.example/animation_94.apng b/common/nori/nori_test/palette.example/animation_94.apng deleted file mode 100755 index 665983e..0000000 Binary files a/common/nori/nori_test/palette.example/animation_94.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_94.png b/common/nori/nori_test/palette.example/animation_94.png new file mode 100755 index 0000000..195dfd6 Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_94.png differ diff --git a/common/nori/nori_test/palette.example/animation_95.apng b/common/nori/nori_test/palette.example/animation_95.apng deleted file mode 100755 index ac12de5..0000000 Binary files a/common/nori/nori_test/palette.example/animation_95.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_95.png b/common/nori/nori_test/palette.example/animation_95.png new file mode 100755 index 0000000..0267601 Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_95.png differ diff --git a/common/nori/nori_test/palette.example/animation_96.apng b/common/nori/nori_test/palette.example/animation_96.apng deleted file mode 100755 index baef190..0000000 Binary files a/common/nori/nori_test/palette.example/animation_96.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_96.png b/common/nori/nori_test/palette.example/animation_96.png new file mode 100755 index 0000000..9a0377c Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_96.png differ diff --git a/common/nori/nori_test/palette.example/animation_97.apng b/common/nori/nori_test/palette.example/animation_97.apng deleted file mode 100755 index 380502d..0000000 Binary files a/common/nori/nori_test/palette.example/animation_97.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_97.png b/common/nori/nori_test/palette.example/animation_97.png new file mode 100755 index 0000000..76c4037 Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_97.png differ diff --git a/common/nori/nori_test/palette.example/animation_98.apng b/common/nori/nori_test/palette.example/animation_98.apng deleted file mode 100755 index 380502d..0000000 Binary files a/common/nori/nori_test/palette.example/animation_98.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_98.png b/common/nori/nori_test/palette.example/animation_98.png new file mode 100755 index 0000000..2a0c9b9 Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_98.png differ diff --git a/common/nori/nori_test/palette.example/animation_99.apng b/common/nori/nori_test/palette.example/animation_99.apng deleted file mode 100755 index baef190..0000000 Binary files a/common/nori/nori_test/palette.example/animation_99.apng and /dev/null differ diff --git a/common/nori/nori_test/palette.example/animation_99.png b/common/nori/nori_test/palette.example/animation_99.png new file mode 100755 index 0000000..04c62bb Binary files /dev/null and b/common/nori/nori_test/palette.example/animation_99.png differ diff --git a/common/nori/nori_test/test1.example/animation_0.apng b/common/nori/nori_test/test1.example/animation_0.png similarity index 100% rename from common/nori/nori_test/test1.example/animation_0.apng rename to common/nori/nori_test/test1.example/animation_0.png diff --git a/common/nori/nori_test/test1.example/animation_1.apng b/common/nori/nori_test/test1.example/animation_1.png similarity index 100% rename from common/nori/nori_test/test1.example/animation_1.apng rename to common/nori/nori_test/test1.example/animation_1.png diff --git a/common/nori/nori_test/test2.example/animation_0.apng b/common/nori/nori_test/test2.example/animation_0.png similarity index 100% rename from common/nori/nori_test/test2.example/animation_0.apng rename to common/nori/nori_test/test2.example/animation_0.png diff --git a/common/nori/nori_test/test2.example/animation_1.apng b/common/nori/nori_test/test2.example/animation_1.png similarity index 100% rename from common/nori/nori_test/test2.example/animation_1.apng rename to common/nori/nori_test/test2.example/animation_1.png