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

0

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

Unescape Escape View File

0

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

Unescape Escape View File

0

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

Unescape Escape View File

0

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

Unescape Escape View File

0

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

Unescape Escape View File

0

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

Unescape Escape View File

0

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

Unescape Escape View File

0

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

Unescape Escape View File

0

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

Unescape Escape View File

0

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

Unescape Escape View File

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 491 B After Width:  |  Height:  |  Size: 491 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 808 B After Width:  |  Height:  |  Size: 808 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 312 B After Width:  |  Height:  |  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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 337 B After Width:  |  Height:  |  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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 337 B After Width:  |  Height:  |  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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 335 B After Width:  |  Height:  |  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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 335 B After Width:  |  Height:  |  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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 334 B After Width:  |  Height:  |  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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 317 B After Width:  |  Height:  |  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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 341 B After Width:  |  Height:  |  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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 340 B After Width:  |  Height:  |  Size: 340 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 307 B After Width:  |  Height:  |  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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 396 B After Width:  |  Height:  |  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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 397 B After Width:  |  Height:  |  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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 391 B After Width:  |  Height:  |  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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 384 B After Width:  |  Height:  |  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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 379 B After Width:  |  Height:  |  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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 363 B After Width:  |  Height:  |  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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 393 B After Width:  |  Height:  |  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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 382 B After Width:  |  Height:  |  Size: 382 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 190 B After Width:  |  Height:  |  Size: 190 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 172 B After Width:  |  Height:  |  Size: 172 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 230 B After Width:  |  Height:  |  Size: 230 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 631 B After Width:  |  Height:  |  Size: 631 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 494 B After Width:  |  Height:  |  Size: 494 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 240 B After Width:  |  Height:  |  Size: 240 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 240 B After Width:  |  Height:  |  Size: 240 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 244 B After Width:  |  Height:  |  Size: 244 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 241 B After Width:  |  Height:  |  Size: 241 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 240 B After Width:  |  Height:  |  Size: 240 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 244 B After Width:  |  Height:  |  Size: 244 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 240 B After Width:  |  Height:  |  Size: 240 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 187 B After Width:  |  Height:  |  Size: 187 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 236 B After Width:  |  Height:  |  Size: 236 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 186 B After Width:  |  Height:  |  Size: 186 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 188 B After Width:  |  Height:  |  Size: 188 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 190 B After Width:  |  Height:  |  Size: 190 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 190 B After Width:  |  Height:  |  Size: 190 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 195 B After Width:  |  Height:  |  Size: 195 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 184 B After Width:  |  Height:  |  Size: 184 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 192 B After Width:  |  Height:  |  Size: 192 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 291 B After Width:  |  Height:  |  Size: 291 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 250 B After Width:  |  Height:  |  Size: 250 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 356 B After Width:  |  Height:  |  Size: 356 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 182 B After Width:  |  Height:  |  Size: 182 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.4 KiB After Width:  |  Height:  |  Size: 3.4 KiB

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 297 B After Width:  |  Height:  |  Size: 297 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 217 B After Width:  |  Height:  |  Size: 217 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 483 B After Width:  |  Height:  |  Size: 483 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 346 B After Width:  |  Height:  |  Size: 346 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 485 B After Width:  |  Height:  |  Size: 485 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 346 B After Width:  |  Height:  |  Size: 346 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 446 B After Width:  |  Height:  |  Size: 446 B