Merge server with github repository

Browse Source

Pas mal de changement n’ont pas été pushé sur le github du serveur,
voici l’occasion de faire une bonne synchronisation :)

...

This commit is contained in:

Ombridride

2014-11-16 22:23:16 +01:00

parent 87b1cd745f

commit 2e895a7790

4474 changed files with 1121 additions and 1097 deletions

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

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

0

mods/plantlife_modpack/.gitignore vendored Executable file → Normal file

0

mods/plantlife_modpack/API.txt Executable file → Normal file

0

mods/plantlife_modpack/LICENSE Executable file → Normal file

0

mods/plantlife_modpack/README Executable file → Normal file

0

mods/plantlife_modpack/along_shore/depends.txt Executable file → Normal file

0

mods/plantlife_modpack/along_shore/init.lua Executable file → Normal file

0

mods/plantlife_modpack/along_shore/textures/along_shore_seaweed_1Darker.png Executable file → Normal file

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

0

mods/plantlife_modpack/along_shore/textures/credit_textures.txt Executable file → Normal file

0

mods/plantlife_modpack/along_shore/textures/old/LillyPad3x16.png Executable file → Normal file

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

0

mods/plantlife_modpack/along_shore/textures/old/MultiLilly16x.png Executable file → Normal file

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

0

mods/plantlife_modpack/along_shore/textures/old/along_shore_empty.png Executable file → Normal file

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

0

mods/plantlife_modpack/along_shore/textures/old/along_shore_lilypads_1.png Executable file → Normal file

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

0

mods/plantlife_modpack/along_shore/textures/old/along_shore_lilypads_2.png Executable file → Normal file

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

0

mods/plantlife_modpack/along_shore/textures/old/along_shore_lilypads_3.png Executable file → Normal file

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

0

mods/plantlife_modpack/along_shore/textures/old/along_shore_lilypads_4.png Executable file → Normal file

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

0

mods/plantlife_modpack/along_shore/textures/old/along_shore_pondscum_1.png Executable file → Normal file

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

0

mods/plantlife_modpack/along_shore/textures/old/along_shore_seaweed_1.png Executable file → Normal file

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

0

mods/plantlife_modpack/along_shore/textures/old/along_shore_seaweed_2.png Executable file → Normal file

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

0

mods/plantlife_modpack/along_shore/textures/old/along_shore_seaweed_3.png Executable file → Normal file

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

0

mods/plantlife_modpack/along_shore/textures/old/along_shore_seaweed_4.png Executable file → Normal file

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

0

mods/plantlife_modpack/along_shore/textures/old/flowers_seaweed.png Executable file → Normal file

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

0

mods/plantlife_modpack/along_shore/textures/old/flowers_waterlily.png Executable file → Normal file

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

0

mods/plantlife_modpack/along_shore/textures/old/flowers_waterlily_22.5.png Executable file → Normal file

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

0

mods/plantlife_modpack/along_shore/textures/old/flowers_waterlily_45.png Executable file → Normal file

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

0

mods/plantlife_modpack/along_shore/textures/old/flowers_waterlily_67.5.png Executable file → Normal file

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

0

mods/plantlife_modpack/along_shore/textures/old/lillyPad5x16.png Executable file → Normal file

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

0

mods/plantlife_modpack/along_shore/textures/old/lillypad3Flower16x.png Executable file → Normal file

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

0

mods/plantlife_modpack/along_shore/textures/old/pondscum16xc.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes/depends.txt Executable file → Normal file

0

mods/plantlife_modpack/bushes/init.lua Executable file → Normal file

0

mods/plantlife_modpack/bushes/textures/bushes_branches_center_1.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes/textures/bushes_branches_center_2.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes/textures/bushes_branches_left_1.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes/textures/bushes_branches_left_2.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes/textures/bushes_branches_right_1.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes/textures/bushes_branches_right_2.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes/textures/bushes_leaves_1.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes/textures/bushes_leaves_2.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes/textures/bushes_youngtree2trunk.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes/textures/bushes_youngtree2trunk_inv.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes/textures/old & unused/BlockBranch1.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes/textures/old & unused/BlockBranch1L.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes/textures/old & unused/BlockBranch1R.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes/textures/old & unused/BushBranches1.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes/textures/old & unused/BushBranches1sm.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes/textures/old & unused/BushBranches1sm2.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes/textures/old & unused/BushBranches1sm3.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes/textures/old & unused/BushBranches1sm4.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes/textures/old & unused/BushBranchesCenter.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes/textures/old & unused/BushBranchesSide1.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes/textures/old & unused/BushBranchesSide2.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes/textures/old & unused/blank.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes/textures/old & unused/moretrees_pine_leaves3.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes_classic/cooking.lua Executable file → Normal file

0

mods/plantlife_modpack/bushes_classic/depends.txt Executable file → Normal file

0

mods/plantlife_modpack/bushes_classic/image_credits.txt Executable file → Normal file

0

mods/plantlife_modpack/bushes_classic/init.lua Executable file → Normal file

0

mods/plantlife_modpack/bushes_classic/locale/de.txt Executable file → Normal file

0

mods/plantlife_modpack/bushes_classic/locale/template.txt Executable file → Normal file

0

mods/plantlife_modpack/bushes_classic/nodes.lua Executable file → Normal file

0

mods/plantlife_modpack/bushes_classic/textures/bushes_basket_blackberry_top.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes_classic/textures/bushes_basket_blueberry_top.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes_classic/textures/bushes_basket_bottom.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes_classic/textures/bushes_basket_empty_top.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes_classic/textures/bushes_basket_gooseberry_top.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes_classic/textures/bushes_basket_mixed_berry_top.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes_classic/textures/bushes_basket_raspberry_top.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes_classic/textures/bushes_basket_side.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes_classic/textures/bushes_basket_strawberry_top.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes_classic/textures/bushes_blackberry.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes_classic/textures/bushes_blackberry_bush.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes_classic/textures/bushes_blackberry_pie_cooked.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes_classic/textures/bushes_blackberry_pie_raw.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes_classic/textures/bushes_blackberry_pie_slice.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes_classic/textures/bushes_blueberry.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes_classic/textures/bushes_blueberry_bush.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes_classic/textures/bushes_blueberry_pie_cooked.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes_classic/textures/bushes_blueberry_pie_raw.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes_classic/textures/bushes_blueberry_pie_slice.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes_classic/textures/bushes_bush_bottom.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes_classic/textures/bushes_bush_top.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes_classic/textures/bushes_fruitless_bush.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes_classic/textures/bushes_fruitless_bush_bottom.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes_classic/textures/bushes_fruitless_bush_top.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes_classic/textures/bushes_gooseberry.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes_classic/textures/bushes_gooseberry_bush.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes_classic/textures/bushes_gooseberry_pie_cooked.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes_classic/textures/bushes_gooseberry_pie_raw.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes_classic/textures/bushes_gooseberry_pie_slice.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes_classic/textures/bushes_mixed_berry_pie_cooked.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes_classic/textures/bushes_mixed_berry_pie_raw.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes_classic/textures/bushes_mixed_berry_pie_slice.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes_classic/textures/bushes_raspberry.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes_classic/textures/bushes_raspberry_bush.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes_classic/textures/bushes_raspberry_pie_cooked.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes_classic/textures/bushes_raspberry_pie_raw.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes_classic/textures/bushes_raspberry_pie_slice.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes_classic/textures/bushes_strawberry.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes_classic/textures/bushes_strawberry_bush.png Executable file → Normal file

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

0

mods/plantlife_modpack/bushes_classic/textures/bushes_strawberry_pie_cooked.png Executable file → Normal file

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

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