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

Browse Source

Conflicts:
	mods/nether/nether/items.lua

...

This commit is contained in:

LeMagnesium 2014-10-29 22:28:40 +01:00

parent fa97a1934e a1529c8ce8

commit 88b167c8ef

1915 changed files with 96 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/homedecor_modpack/.gitignore vendored Normal file → Executable file

Unescape Escape View File

0

mods/homedecor_modpack/README Normal file → Executable file

Unescape Escape View File

0

mods/homedecor_modpack/building_blocks/depends.txt Normal file → Executable file

Unescape Escape View File

0

mods/homedecor_modpack/building_blocks/init.lua Normal file → Executable file

Unescape Escape View File

0

mods/homedecor_modpack/building_blocks/textures/building_blocks_Adobe.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/building_blocks/textures/building_blocks_BWtile.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/building_blocks/textures/building_blocks_Roofing.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/building_blocks/textures/building_blocks_brobble.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/building_blocks/textures/building_blocks_brobble_spread_inv.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/building_blocks/textures/building_blocks_bwtile_inv.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/building_blocks/textures/building_blocks_cast_iron.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/building_blocks/textures/building_blocks_cast_iron_fireplace.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/building_blocks/textures/building_blocks_grate.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/building_blocks/textures/building_blocks_grate2.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/building_blocks/textures/building_blocks_gravel_spread_inv.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/building_blocks/textures/building_blocks_hardwood.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/building_blocks/textures/building_blocks_knife.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/building_blocks/textures/building_blocks_marble.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/building_blocks/textures/building_blocks_sglass.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/building_blocks/textures/building_blocks_sticks.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/building_blocks/textures/building_blocks_tar.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/building_blocks/textures/building_blocks_tar_base.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/building_blocks/textures/building_blocks_tar_spread_inv.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/building_blocks/textures/building_blocks_towel.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/building_blocks/textures/building_blocks_towel_inv.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/building_blocks/textures/building_blocks_wglass.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/chains/depends.txt Normal file → Executable file

Unescape Escape View File

0

mods/homedecor_modpack/chains/init.lua Normal file → Executable file

Unescape Escape View File

0

mods/homedecor_modpack/chains/textures/chains_chain.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/chains/textures/chains_chain_brass.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/chains/textures/chains_chain_top.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/chains/textures/chains_chain_top_brass.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/chains/textures/chains_chain_top_brass_inv.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/chains/textures/chains_chain_top_inv.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/chains/textures/chains_chandelier.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/chains/textures/chains_chandelier_brass.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/chains/textures/chains_chandelier_brass_inv.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/chains/textures/chains_chandelier_inv.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/computer/CHANGES.txt Normal file → Executable file

Unescape Escape View File

0

mods/homedecor_modpack/computer/LICENSE.txt Normal file → Executable file

Unescape Escape View File

0

mods/homedecor_modpack/computer/README.txt Normal file → Executable file

Unescape Escape View File

0

mods/homedecor_modpack/computer/TODO.txt Normal file → Executable file

Unescape Escape View File

0

mods/homedecor_modpack/computer/computers.lua Normal file → Executable file

Unescape Escape View File

0

mods/homedecor_modpack/computer/depends.txt Normal file → Executable file

Unescape Escape View File

0

mods/homedecor_modpack/computer/init.lua Normal file → Executable file

Unescape Escape View File

0

mods/homedecor_modpack/computer/locale/es.txt Normal file → Executable file

Unescape Escape View File

0

mods/homedecor_modpack/computer/miscitems.lua Normal file → Executable file

Unescape Escape View File

0

mods/homedecor_modpack/computer/recipes.lua Normal file → Executable file

Unescape Escape View File

0

mods/homedecor_modpack/computer/textures/computer_admiral128_bk.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/computer/textures/computer_admiral128_bt.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/computer/textures/computer_admiral128_ft.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/computer/textures/computer_admiral128_lt.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/computer/textures/computer_admiral128_rt.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/computer/textures/computer_admiral128_tp.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/computer/textures/computer_admiral64_bk.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/computer/textures/computer_admiral64_bt.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/computer/textures/computer_admiral64_ft.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/computer/textures/computer_admiral64_lt.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/computer/textures/computer_admiral64_rt.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/computer/textures/computer_admiral64_tp.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/computer/textures/computer_babytower_back.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/computer/textures/computer_babytower_bottom.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/computer/textures/computer_babytower_front.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/computer/textures/computer_babytower_left.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/computer/textures/computer_babytower_right.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/computer/textures/computer_babytower_top.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/computer/textures/computer_computer_front_old.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/computer/textures/computer_computer_top_old.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/computer/textures/computer_monitor_b.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/computer/textures/computer_monitor_bt.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/computer/textures/computer_monitor_btdl.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/computer/textures/computer_monitor_f_bios.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/computer/textures/computer_monitor_f_desktop.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/computer/textures/computer_monitor_f_dl.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/computer/textures/computer_monitor_f_loading.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/computer/textures/computer_monitor_f_login.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/computer/textures/computer_monitor_f_off.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/computer/textures/computer_monitor_f_on.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/computer/textures/computer_monitor_l.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/computer/textures/computer_monitor_r.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/computer/textures/computer_monitor_t.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/computer/textures/computer_monitor_t_off.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/computer/textures/computer_monitor_tdl.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/computer/textures/computer_piepad_inv.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/computer/textures/computer_piepad_inv_off.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/computer/textures/computer_printer_b.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/computer/textures/computer_printer_bt.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/computer/textures/computer_printer_f.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/computer/textures/computer_printer_l.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/computer/textures/computer_printer_r.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/computer/textures/computer_printer_t.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/computer/textures/computer_router_b.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/computer/textures/computer_router_bt.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/computer/textures/computer_router_f.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/computer/textures/computer_router_f_animated.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/computer/textures/computer_router_l.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/computer/textures/computer_router_r.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/computer/textures/computer_router_t.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/computer/textures/computer_server_bt.png Normal file → Executable file

Unescape Escape View File

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

0

mods/homedecor_modpack/computer/textures/computer_server_f_off.png Normal file → Executable file

Unescape Escape View File

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

Some files were not shown because too many files have changed in this diff Show More