diff --git a/js/interface/settings.js b/js/interface/settings.js index 1bc79648..d2bdcc5d 100644 --- a/js/interface/settings.js +++ b/js/interface/settings.js @@ -457,6 +457,7 @@ const Settings = { DisplayMode.vue.allow_mirroring = value; }}) new Setting('deactivate_size_limit', {category: 'edit', value: false}); + new Setting('modded_entity_integer_size',{category:'edit', value: true}); new Setting('vertex_merge_distance', {category: 'edit', value: 0.1, step: 0.01, type: 'number', min: 0}); new Setting('preview_paste_behavior', {category: 'edit', value: 'always_ask', type: 'select', options: { 'always_ask': tl('settings.preview_paste_behavior.always_ask'), diff --git a/js/io/formats/modded_entity.js b/js/io/formats/modded_entity.js index a108f23f..23df428c 100644 --- a/js/io/formats/modded_entity.js +++ b/js/io/formats/modded_entity.js @@ -996,7 +996,7 @@ var format = new ModelFormat({ integer_size: true, animation_mode: true, }) -Object.defineProperty(format, 'integer_size', {get: _ => Templates.get('integer_size')}); +Object.defineProperty(format, 'integer_size', {get: _ => Templates.get('integer_size') || settings.modded_entity_integer_size.value}); codec.format = format; diff --git a/lang/en.json b/lang/en.json index 71d4e4c3..09f589a8 100644 --- a/lang/en.json +++ b/lang/en.json @@ -892,6 +892,8 @@ "settings.highlight_cubes.desc": "Highlight elements when you hover over them or select them", "settings.deactivate_size_limit": "Deactivate Size Limit", "settings.deactivate_size_limit.desc": "Deactivate the size limit for specific model formats. WARNING: This can cause invalid models.", + "settings.modded_entity_integer_size": "Modded Entity Integer Size", + "settings.modded_entity_integer_size.desc": "Limit cube sizes in the Modded Entity format to integers. While floats are technically supported in some versions, integers are much easier to UV-map.", "settings.allow_display_slot_mirror": "Allow Display Slot Mirroring", "settings.allow_display_slot_mirror.desc": "Allow Display slots for Java item models to be mirrored. WARNING: This only works in Minecraft 1.14 or earlier or in special cases.", "settings.vertex_merge_distance": "Vertex Merge Distance",