Merge remote-tracking branch 'origin/mcl_bamboo_too' into mcl_bamboo_too
# Conflicts: # mods/ITEMS/mcl_bamboo/bamboo_base.luahardcore_mode_test
commit
e7c238c17e
# Conflicts: # mods/ITEMS/mcl_bamboo/bamboo_base.luahardcore_mode_test