cacti no longer spawn outside of desert variants
formatting and commenting fixes
reformat for lua and CI
Fixed the CRAFTING_NO_RECIPE hook call.

It used a pointer-to-pointer-to-cCraftingRecipe, which the Lua bindings didn't know how to handle, and emitted a warning message at runtime.
Fixes #1641.
conflict resolution
Merge pull request #1638 from p-mcgowan/cactiNoLongerSpawnOnBeaches

cacti no longer spawn outside of desert variants
Merge pull request #1648 from mc-server/CraftingLuaFix

Fixed the CRAFTING_NO_RECIPE hook call.
cleanup junky stuff
cleanup junky stuff
cleanup junky stuff
Merge branch 'master' of github.com:p-mcgowan/MCServer

cleanup