diff options
| author | STRWarrior <niels.breuker@hotmail.nl> | 2014-03-31 19:58:19 +0200 |
|---|---|---|
| committer | STRWarrior <niels.breuker@hotmail.nl> | 2014-03-31 19:58:19 +0200 |
| commit | f7df8e133b66aafcf35f0590a0ac525a7d2f9278 (patch) | |
| tree | f36d96dd5d7665cc996f586c0399426419c30c05 | |
| parent | Added new merge strategy "msDifference" (diff) | |
| download | cuberite-f7df8e133b66aafcf35f0590a0ac525a7d2f9278.tar cuberite-f7df8e133b66aafcf35f0590a0ac525a7d2f9278.tar.gz cuberite-f7df8e133b66aafcf35f0590a0ac525a7d2f9278.tar.bz2 cuberite-f7df8e133b66aafcf35f0590a0ac525a7d2f9278.tar.lz cuberite-f7df8e133b66aafcf35f0590a0ac525a7d2f9278.tar.xz cuberite-f7df8e133b66aafcf35f0590a0ac525a7d2f9278.tar.zst cuberite-f7df8e133b66aafcf35f0590a0ac525a7d2f9278.zip | |
| -rw-r--r-- | MCServer/Plugins/APIDump/APIDesc.lua | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/MCServer/Plugins/APIDump/APIDesc.lua index 6f8a14421..532b4b665 100644 --- a/MCServer/Plugins/APIDump/APIDesc.lua +++ b/MCServer/Plugins/APIDump/APIDesc.lua @@ -230,22 +230,22 @@ g_APIDesc = </p> <table class="inline"> <tbody><tr> - <th colspan="2">area block</th><th colspan="3">result</th> + <th colspan="2">area block</th><th colspan="4">result</th> </tr> <tr> - <th> this </th><th> Src </th><th> msOverwrite </th><th> msFillAir </th><th> msImprint </th> + <th> this </th><th> Src </th><th> msOverwrite </th><th> msFillAir </th><th> msImprint </th><th> msDifference </th> </tr> <tr> - <td> air </td><td> air </td><td> air </td><td> air </td><td> air </td> + <td> air </td><td> air </td><td> air </td><td> air </td><td> air </td><td> air </td> </tr> <tr> - <td> A </td><td> air </td><td> air </td><td> A </td><td> A </td> + <td> A </td><td> air </td><td> air </td><td> A </td><td> A </td><td> air </td> </tr> <tr> - <td> air </td><td> B </td><td> B </td><td> B </td><td> B </td> + <td> air </td><td> B </td><td> B </td><td> B </td><td> B </td><td> B </td> </tr> <tr> - <td> A </td><td> B </td><td> B </td><td> A </td><td> B </td> + <td> A </td><td> B </td><td> B </td><td> A </td><td> B </td><td> B </td> </tr> </tbody></table> @@ -255,6 +255,8 @@ g_APIDesc = <li class="level1">msOverwrite completely overwrites all blocks with the Src's blocks</li> <li class="level1">msFillAir overwrites only those blocks that were air</li> <li class="level1">msImprint overwrites with only those blocks that are non-air</li> + <li class="level1">msSpongePrint Sponge overwrites nothing, everything else overwrites anything</li> + <li class="level1">msDifference changes all the blocks wich are the same to air. Otherwise the source block gets placed.</li> </ol> </p> |