Merge branch 'master' of http://github.com/Ombridride/minetest-minetestforfun-server

Browse Source

...

This commit is contained in:

LeMagnesium 2014-12-14 22:58:43 +01:00

parent 386816df66 dcc9228469

commit 97ef8aa781

63 changed files with 0 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

mods/christmas_craft

crafts.luadepends.txtinit.luamods.luasettings.luasettings.txt

sounds

cannons_splash.1.oggcannons_splash.2.oggcannons_splash.3.oggcannons_splash.4.ogg

textures

Snowman_F.pngWreath.pngc_lights.pngchristmas_craft_baubles_side_bl.pngchristmas_craft_baubles_side_gr.pngchristmas_craft_baubles_side_or.pngchristmas_craft_baubles_side_pi.pngchristmas_craft_baubles_side_re.pngchristmas_craft_baubles_side_si.pngchristmas_craft_baubles_side_vi.pngchristmas_craft_baubles_side_ye.pngchristmas_craft_baubles_top.pngchristmas_craft_baubles_top_bl.pngchristmas_craft_baubles_top_gr.pngchristmas_craft_baubles_top_or.pngchristmas_craft_baubles_top_pi.pngchristmas_craft_baubles_top_re.pngchristmas_craft_baubles_top_si.pngchristmas_craft_baubles_top_vi.pngchristmas_craft_baubles_top_ye.pngchristmas_craft_bow_bottom.pngchristmas_craft_bow_side.pngchristmas_craft_bow_top.pngchristmas_craft_leaves_side.pngchristmas_craft_leaves_top.pngchristmas_craft_paper_bl.pngchristmas_craft_paper_gr.pngchristmas_craft_paper_or.pngchristmas_craft_paper_pi.pngchristmas_craft_paper_re.pngchristmas_craft_paper_vi.pngchristmas_craft_paper_ye.pngchristmas_craft_present_bl.pngchristmas_craft_present_box.pngchristmas_craft_present_gr.pngchristmas_craft_present_or.pngchristmas_craft_present_pi.pngchristmas_craft_present_re.pngchristmas_craft_present_vi.pngchristmas_craft_present_wh.pngchristmas_craft_present_ye.pngchristmas_craft_red_ribbon.pngchristmas_craft_which_list.pngchristmas_leaves.pngdefault_stick.pnggrass_w_snow_side.pnglights_animated.pngside_stick.pngsnow.pngsnow_ball.pngsnow_footstep.pngsnowball.pngstar.png

0

mods/christmas_craft/christmas_craft/crafts.lua → mods/christmas_craft/crafts.lua

0

mods/christmas_craft/christmas_craft/depends.txt → mods/christmas_craft/depends.txt

0

mods/christmas_craft/christmas_craft/init.lua → mods/christmas_craft/init.lua

0

mods/christmas_craft/christmas_craft/mods.lua → mods/christmas_craft/mods.lua

0

mods/christmas_craft/christmas_craft/settings.lua → mods/christmas_craft/settings.lua

0

mods/christmas_craft/christmas_craft/settings.txt → mods/christmas_craft/settings.txt

0

mods/christmas_craft/christmas_craft/sounds/cannons_splash.1.ogg → mods/christmas_craft/sounds/cannons_splash.1.ogg

0

mods/christmas_craft/christmas_craft/sounds/cannons_splash.2.ogg → mods/christmas_craft/sounds/cannons_splash.2.ogg

0

mods/christmas_craft/christmas_craft/sounds/cannons_splash.3.ogg → mods/christmas_craft/sounds/cannons_splash.3.ogg

0

mods/christmas_craft/christmas_craft/sounds/cannons_splash.4.ogg → mods/christmas_craft/sounds/cannons_splash.4.ogg

0

mods/christmas_craft/christmas_craft/textures/Snowman_F.png → mods/christmas_craft/textures/Snowman_F.png

Side by Side Swipe Before (image error) Size: 491 B After (image error) Size: 491 B

0

mods/christmas_craft/christmas_craft/textures/Wreath.png → mods/christmas_craft/textures/Wreath.png

Side by Side Swipe Before (image error) Size: 808 B After (image error) Size: 808 B

0

mods/christmas_craft/christmas_craft/textures/c_lights.png → mods/christmas_craft/textures/c_lights.png

Side by Side Swipe Before (image error) Size: 312 B After (image error) Size: 312 B

0

mods/christmas_craft/christmas_craft/textures/christmas_craft_baubles_side_bl.png → mods/christmas_craft/textures/christmas_craft_baubles_side_bl.png

Side by Side Swipe Before (image error) Size: 337 B After (image error) Size: 337 B

0

mods/christmas_craft/christmas_craft/textures/christmas_craft_baubles_side_gr.png → mods/christmas_craft/textures/christmas_craft_baubles_side_gr.png

Side by Side Swipe Before (image error) Size: 337 B After (image error) Size: 337 B

0

mods/christmas_craft/christmas_craft/textures/christmas_craft_baubles_side_or.png → mods/christmas_craft/textures/christmas_craft_baubles_side_or.png

Side by Side Swipe Before (image error) Size: 335 B After (image error) Size: 335 B

0

mods/christmas_craft/christmas_craft/textures/christmas_craft_baubles_side_pi.png → mods/christmas_craft/textures/christmas_craft_baubles_side_pi.png

Side by Side Swipe Before (image error) Size: 335 B After (image error) Size: 335 B

0

mods/christmas_craft/christmas_craft/textures/christmas_craft_baubles_side_re.png → mods/christmas_craft/textures/christmas_craft_baubles_side_re.png

Side by Side Swipe Before (image error) Size: 334 B After (image error) Size: 334 B

0

mods/christmas_craft/christmas_craft/textures/christmas_craft_baubles_side_si.png → mods/christmas_craft/textures/christmas_craft_baubles_side_si.png

Side by Side Swipe Before (image error) Size: 317 B After (image error) Size: 317 B

0

mods/christmas_craft/christmas_craft/textures/christmas_craft_baubles_side_vi.png → mods/christmas_craft/textures/christmas_craft_baubles_side_vi.png

Side by Side Swipe Before (image error) Size: 341 B After (image error) Size: 341 B

0

mods/christmas_craft/christmas_craft/textures/christmas_craft_baubles_side_ye.png → mods/christmas_craft/textures/christmas_craft_baubles_side_ye.png

Side by Side Swipe Before (image error) Size: 340 B After (image error) Size: 340 B

0

mods/christmas_craft/christmas_craft/textures/christmas_craft_baubles_top.png → mods/christmas_craft/textures/christmas_craft_baubles_top.png

Side by Side Swipe Before (image error) Size: 307 B After (image error) Size: 307 B

0

mods/christmas_craft/christmas_craft/textures/christmas_craft_baubles_top_bl.png → mods/christmas_craft/textures/christmas_craft_baubles_top_bl.png

Side by Side Swipe Before (image error) Size: 396 B After (image error) Size: 396 B

0

mods/christmas_craft/christmas_craft/textures/christmas_craft_baubles_top_gr.png → mods/christmas_craft/textures/christmas_craft_baubles_top_gr.png

Side by Side Swipe Before (image error) Size: 397 B After (image error) Size: 397 B

0

mods/christmas_craft/christmas_craft/textures/christmas_craft_baubles_top_or.png → mods/christmas_craft/textures/christmas_craft_baubles_top_or.png

Side by Side Swipe Before (image error) Size: 391 B After (image error) Size: 391 B

0

mods/christmas_craft/christmas_craft/textures/christmas_craft_baubles_top_pi.png → mods/christmas_craft/textures/christmas_craft_baubles_top_pi.png

Side by Side Swipe Before (image error) Size: 384 B After (image error) Size: 384 B

0

mods/christmas_craft/christmas_craft/textures/christmas_craft_baubles_top_re.png → mods/christmas_craft/textures/christmas_craft_baubles_top_re.png

Side by Side Swipe Before (image error) Size: 379 B After (image error) Size: 379 B

0

mods/christmas_craft/christmas_craft/textures/christmas_craft_baubles_top_si.png → mods/christmas_craft/textures/christmas_craft_baubles_top_si.png

Side by Side Swipe Before (image error) Size: 363 B After (image error) Size: 363 B

0

mods/christmas_craft/christmas_craft/textures/christmas_craft_baubles_top_vi.png → mods/christmas_craft/textures/christmas_craft_baubles_top_vi.png

Side by Side Swipe Before (image error) Size: 393 B After (image error) Size: 393 B

0

mods/christmas_craft/christmas_craft/textures/christmas_craft_baubles_top_ye.png → mods/christmas_craft/textures/christmas_craft_baubles_top_ye.png

Side by Side Swipe Before (image error) Size: 382 B After (image error) Size: 382 B

0

mods/christmas_craft/christmas_craft/textures/christmas_craft_bow_bottom.png → mods/christmas_craft/textures/christmas_craft_bow_bottom.png

Side by Side Swipe Before (image error) Size: 190 B After (image error) Size: 190 B

0

mods/christmas_craft/christmas_craft/textures/christmas_craft_bow_side.png → mods/christmas_craft/textures/christmas_craft_bow_side.png

Side by Side Swipe Before (image error) Size: 172 B After (image error) Size: 172 B

0

mods/christmas_craft/christmas_craft/textures/christmas_craft_bow_top.png → mods/christmas_craft/textures/christmas_craft_bow_top.png

Side by Side Swipe Before (image error) Size: 230 B After (image error) Size: 230 B

0

mods/christmas_craft/christmas_craft/textures/christmas_craft_leaves_side.png → mods/christmas_craft/textures/christmas_craft_leaves_side.png

Side by Side Swipe Before (image error) Size: 631 B After (image error) Size: 631 B

0

mods/christmas_craft/christmas_craft/textures/christmas_craft_leaves_top.png → mods/christmas_craft/textures/christmas_craft_leaves_top.png

Side by Side Swipe Before (image error) Size: 494 B After (image error) Size: 494 B

0

mods/christmas_craft/christmas_craft/textures/christmas_craft_paper_bl.png → mods/christmas_craft/textures/christmas_craft_paper_bl.png

Side by Side Swipe Before (image error) Size: 240 B After (image error) Size: 240 B

0

mods/christmas_craft/christmas_craft/textures/christmas_craft_paper_gr.png → mods/christmas_craft/textures/christmas_craft_paper_gr.png

Side by Side Swipe Before (image error) Size: 240 B After (image error) Size: 240 B

0

mods/christmas_craft/christmas_craft/textures/christmas_craft_paper_or.png → mods/christmas_craft/textures/christmas_craft_paper_or.png

Side by Side Swipe Before (image error) Size: 244 B After (image error) Size: 244 B

0

mods/christmas_craft/christmas_craft/textures/christmas_craft_paper_pi.png → mods/christmas_craft/textures/christmas_craft_paper_pi.png

Side by Side Swipe Before (image error) Size: 241 B After (image error) Size: 241 B

0

mods/christmas_craft/christmas_craft/textures/christmas_craft_paper_re.png → mods/christmas_craft/textures/christmas_craft_paper_re.png

Side by Side Swipe Before (image error) Size: 240 B After (image error) Size: 240 B

0

mods/christmas_craft/christmas_craft/textures/christmas_craft_paper_vi.png → mods/christmas_craft/textures/christmas_craft_paper_vi.png

Side by Side Swipe Before (image error) Size: 244 B After (image error) Size: 244 B

0

mods/christmas_craft/christmas_craft/textures/christmas_craft_paper_ye.png → mods/christmas_craft/textures/christmas_craft_paper_ye.png

Side by Side Swipe Before (image error) Size: 240 B After (image error) Size: 240 B

0

mods/christmas_craft/christmas_craft/textures/christmas_craft_present_bl.png → mods/christmas_craft/textures/christmas_craft_present_bl.png

Side by Side Swipe Before (image error) Size: 187 B After (image error) Size: 187 B

0

mods/christmas_craft/christmas_craft/textures/christmas_craft_present_box.png → mods/christmas_craft/textures/christmas_craft_present_box.png

Side by Side Swipe Before (image error) Size: 236 B After (image error) Size: 236 B

0

mods/christmas_craft/christmas_craft/textures/christmas_craft_present_gr.png → mods/christmas_craft/textures/christmas_craft_present_gr.png

Side by Side Swipe Before (image error) Size: 186 B After (image error) Size: 186 B

0

mods/christmas_craft/christmas_craft/textures/christmas_craft_present_or.png → mods/christmas_craft/textures/christmas_craft_present_or.png

Side by Side Swipe Before (image error) Size: 188 B After (image error) Size: 188 B

0

mods/christmas_craft/christmas_craft/textures/christmas_craft_present_pi.png → mods/christmas_craft/textures/christmas_craft_present_pi.png

Side by Side Swipe Before (image error) Size: 190 B After (image error) Size: 190 B

0

mods/christmas_craft/christmas_craft/textures/christmas_craft_present_re.png → mods/christmas_craft/textures/christmas_craft_present_re.png

Side by Side Swipe Before (image error) Size: 190 B After (image error) Size: 190 B

0

mods/christmas_craft/christmas_craft/textures/christmas_craft_present_vi.png → mods/christmas_craft/textures/christmas_craft_present_vi.png

Side by Side Swipe Before (image error) Size: 195 B After (image error) Size: 195 B

0

mods/christmas_craft/christmas_craft/textures/christmas_craft_present_wh.png → mods/christmas_craft/textures/christmas_craft_present_wh.png

Side by Side Swipe Before (image error) Size: 184 B After (image error) Size: 184 B

0

mods/christmas_craft/christmas_craft/textures/christmas_craft_present_ye.png → mods/christmas_craft/textures/christmas_craft_present_ye.png

Side by Side Swipe Before (image error) Size: 192 B After (image error) Size: 192 B

0

mods/christmas_craft/christmas_craft/textures/christmas_craft_red_ribbon.png → mods/christmas_craft/textures/christmas_craft_red_ribbon.png

Side by Side Swipe Before (image error) Size: 291 B After (image error) Size: 291 B

0

mods/christmas_craft/christmas_craft/textures/christmas_craft_which_list.png → mods/christmas_craft/textures/christmas_craft_which_list.png

Side by Side Swipe Before (image error) Size: 250 B After (image error) Size: 250 B

0

mods/christmas_craft/christmas_craft/textures/christmas_leaves.png → mods/christmas_craft/textures/christmas_leaves.png

Side by Side Swipe Before (image error) Size: 356 B After (image error) Size: 356 B

0

mods/christmas_craft/christmas_craft/textures/default_stick.png → mods/christmas_craft/textures/default_stick.png

Side by Side Swipe Before (image error) Size: 182 B After (image error) Size: 182 B

0

mods/christmas_craft/christmas_craft/textures/grass_w_snow_side.png → mods/christmas_craft/textures/grass_w_snow_side.png

Side by Side Swipe Overlay Before (image error) Size: 3.4 KiB After (image error) Size: 3.4 KiB

0

mods/christmas_craft/christmas_craft/textures/lights_animated.png → mods/christmas_craft/textures/lights_animated.png

Side by Side Swipe Before (image error) Size: 297 B After (image error) Size: 297 B

0

mods/christmas_craft/christmas_craft/textures/side_stick.png → mods/christmas_craft/textures/side_stick.png

Side by Side Swipe Before (image error) Size: 217 B After (image error) Size: 217 B

0

mods/christmas_craft/christmas_craft/textures/snow.png → mods/christmas_craft/textures/snow.png

Side by Side Swipe Before (image error) Size: 483 B After (image error) Size: 483 B

0

mods/christmas_craft/christmas_craft/textures/snow_ball.png → mods/christmas_craft/textures/snow_ball.png

Side by Side Swipe Before (image error) Size: 346 B After (image error) Size: 346 B

0

mods/christmas_craft/christmas_craft/textures/snow_footstep.png → mods/christmas_craft/textures/snow_footstep.png

Side by Side Swipe Before (image error) Size: 485 B After (image error) Size: 485 B

0

mods/christmas_craft/christmas_craft/textures/snowball.png → mods/christmas_craft/textures/snowball.png

Side by Side Swipe Before (image error) Size: 346 B After (image error) Size: 346 B

0

mods/christmas_craft/christmas_craft/textures/star.png → mods/christmas_craft/textures/star.png

Side by Side Swipe Before (image error) Size: 446 B After (image error) Size: 446 B