Merge branch 'dev' into feature/create-6
This commit is contained in:
commit
c3994e36f0
31 changed files with 948 additions and 6137 deletions
|
|
@ -2,5 +2,6 @@
|
|||
|
||||
global.FRAMEDBLOCKS_DISABLED_ITEMS = [
|
||||
'framedblocks:framed_soul_torch',
|
||||
'framedblocks:framed_torch'
|
||||
'framedblocks:framed_torch',
|
||||
'framedblocks:framed_obsidian_pressure_plate'
|
||||
];
|
||||
Loading…
Add table
Add a link
Reference in a new issue