Merge server to github

Browse Source

...

This commit is contained in:

Ombridride

2014-12-11 18:53:00 +01:00

parent a7dc6bdff7

commit 887473124e

6873 changed files with 930 additions and 385 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/farming/README.txt Normal file → Executable file

0

mods/farming/blueberry.lua Normal file → Executable file

0

mods/farming/carrot.lua Normal file → Executable file

0

mods/farming/cocoa.lua Normal file → Executable file

0

mods/farming/coffee.lua Normal file → Executable file

0

mods/farming/compatibility.lua Normal file → Executable file

0

mods/farming/corn.lua Normal file → Executable file

0

mods/farming/cotton.lua Normal file → Executable file

0

mods/farming/cucumber.lua Normal file → Executable file

0

mods/farming/depends.txt Normal file → Executable file

0

mods/farming/donut.lua Normal file → Executable file

0

mods/farming/grass.lua Normal file → Executable file

0

mods/farming/hoes.lua Normal file → Executable file

0

mods/farming/init.lua Normal file → Executable file

0

mods/farming/license.txt Normal file → Executable file

0

mods/farming/mapgen.lua Normal file → Executable file

0

mods/farming/melon.lua Normal file → Executable file

0

mods/farming/potato.lua Normal file → Executable file

0

mods/farming/pumpkin.lua Normal file → Executable file

0

mods/farming/raspberry.lua Normal file → Executable file

0

mods/farming/rhubarb.lua Normal file → Executable file

0

mods/farming/soil.lua Normal file → Executable file

0

mods/farming/sugar.lua Normal file → Executable file

0

mods/farming/textures/default_junglegrass.png Normal file → Executable file

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

0

mods/farming/textures/farming_baked_potato.png Normal file → Executable file

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

0

mods/farming/textures/farming_blueberries.png Normal file → Executable file

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

0

mods/farming/textures/farming_blueberry_1.png Normal file → Executable file

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

0

mods/farming/textures/farming_blueberry_2.png Normal file → Executable file

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

0

mods/farming/textures/farming_blueberry_3.png Normal file → Executable file

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

0

mods/farming/textures/farming_blueberry_4.png Normal file → Executable file

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

0

mods/farming/textures/farming_blueberry_muffin.png Normal file → Executable file

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

0

mods/farming/textures/farming_bottle_ethanol.png Normal file → Executable file

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

BIN

mods/farming/textures/farming_bread.png Normal file → Executable file

Binary file not shown.

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

0

mods/farming/textures/farming_carrot.png Normal file → Executable file

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

0

mods/farming/textures/farming_carrot_1.png Normal file → Executable file

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

0

mods/farming/textures/farming_carrot_2.png Normal file → Executable file

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

0

mods/farming/textures/farming_carrot_3.png Normal file → Executable file

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

0

mods/farming/textures/farming_carrot_4.png Normal file → Executable file

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

0

mods/farming/textures/farming_carrot_5.png Normal file → Executable file

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

0

mods/farming/textures/farming_carrot_6.png Normal file → Executable file

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

0

mods/farming/textures/farming_carrot_7.png Normal file → Executable file

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

0

mods/farming/textures/farming_carrot_8.png Normal file → Executable file

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

0

mods/farming/textures/farming_carrot_gold.png Normal file → Executable file

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

0

mods/farming/textures/farming_chocolate_dark.png Normal file → Executable file

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

0

mods/farming/textures/farming_cocoa_1.png Normal file → Executable file

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

0

mods/farming/textures/farming_cocoa_2.png Normal file → Executable file

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

0

mods/farming/textures/farming_cocoa_3.png Normal file → Executable file

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

0

mods/farming/textures/farming_cocoa_beans.png Normal file → Executable file

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

0

mods/farming/textures/farming_coffee_1.png Normal file → Executable file

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

0

mods/farming/textures/farming_coffee_2.png Normal file → Executable file

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

0

mods/farming/textures/farming_coffee_3.png Normal file → Executable file

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

0

mods/farming/textures/farming_coffee_4.png Normal file → Executable file

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

0

mods/farming/textures/farming_coffee_5.png Normal file → Executable file

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

0

mods/farming/textures/farming_coffee_beans.png Normal file → Executable file

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

0

mods/farming/textures/farming_coffee_cup.png Normal file → Executable file

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

0

mods/farming/textures/farming_coffee_cup_hot.png Normal file → Executable file

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

0

mods/farming/textures/farming_cookie.png Normal file → Executable file

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

0

mods/farming/textures/farming_corn.png Normal file → Executable file

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

0

mods/farming/textures/farming_corn_1.png Normal file → Executable file

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

0

mods/farming/textures/farming_corn_2.png Normal file → Executable file

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

0

mods/farming/textures/farming_corn_3.png Normal file → Executable file

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

0

mods/farming/textures/farming_corn_4.png Normal file → Executable file

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

0

mods/farming/textures/farming_corn_5.png Normal file → Executable file

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

0

mods/farming/textures/farming_corn_6.png Normal file → Executable file

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

0

mods/farming/textures/farming_corn_7.png Normal file → Executable file

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

0

mods/farming/textures/farming_corn_8.png Normal file → Executable file

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

0

mods/farming/textures/farming_corn_cob.png Normal file → Executable file

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

BIN

mods/farming/textures/farming_cotton.png Normal file → Executable file

Binary file not shown.

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

BIN

mods/farming/textures/farming_cotton_1.png Normal file → Executable file

Binary file not shown.

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

BIN

mods/farming/textures/farming_cotton_2.png Normal file → Executable file

Binary file not shown.

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

BIN

mods/farming/textures/farming_cotton_3.png Normal file → Executable file

Binary file not shown.

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

BIN

mods/farming/textures/farming_cotton_4.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 179 B

BIN

mods/farming/textures/farming_cotton_5.png Normal file → Executable file

Binary file not shown.

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

BIN

mods/farming/textures/farming_cotton_6.png Normal file → Executable file

Binary file not shown.

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

BIN

mods/farming/textures/farming_cotton_7.png Normal file → Executable file

Binary file not shown.

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

BIN

mods/farming/textures/farming_cotton_8.png Normal file → Executable file

Binary file not shown.

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

BIN

mods/farming/textures/farming_cotton_seed.png Normal file → Executable file

Binary file not shown.

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

0

mods/farming/textures/farming_cucumber.png Normal file → Executable file

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

0

mods/farming/textures/farming_cucumber_1.png Normal file → Executable file

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

0

mods/farming/textures/farming_cucumber_2.png Normal file → Executable file

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

0

mods/farming/textures/farming_cucumber_3.png Normal file → Executable file

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

0

mods/farming/textures/farming_cucumber_4.png Normal file → Executable file

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

0

mods/farming/textures/farming_desert_sand_soil.png Normal file → Executable file

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

0

mods/farming/textures/farming_desert_sand_soil_wet.png Normal file → Executable file

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

0

mods/farming/textures/farming_desert_sand_soil_wet_side.png Normal file → Executable file

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

0

mods/farming/textures/farming_donut.png Normal file → Executable file

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

0

mods/farming/textures/farming_donut_apple.png Normal file → Executable file

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

0

mods/farming/textures/farming_donut_chocolate.png Normal file → Executable file

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

BIN

mods/farming/textures/farming_flour.png Normal file → Executable file

Binary file not shown.

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

0

mods/farming/textures/farming_melon_1.png Normal file → Executable file

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

0

mods/farming/textures/farming_melon_2.png Normal file → Executable file

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

0

mods/farming/textures/farming_melon_3.png Normal file → Executable file

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

0

mods/farming/textures/farming_melon_4.png Normal file → Executable file

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

0

mods/farming/textures/farming_melon_5.png Normal file → Executable file

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

0

mods/farming/textures/farming_melon_6.png Normal file → Executable file

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

0

mods/farming/textures/farming_melon_7.png Normal file → Executable file

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

0

mods/farming/textures/farming_melon_side.png Normal file → Executable file

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

0

mods/farming/textures/farming_melon_slice.png Normal file → Executable file

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

0

mods/farming/textures/farming_melon_top.png Normal file → Executable file

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

0

mods/farming/textures/farming_potato.png Normal file → Executable file

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

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