Fix conflict #6
Merged
Fix conflict #6
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
AlsoSomeoneElse
pushed a commit
that referenced
this pull request
Dec 2, 2020
Signed-off-by: KlemenDEV <klemen.pylo@gmail.com>
AlsoSomeoneElse
pushed a commit
that referenced
this pull request
Dec 2, 2020
* New externalized dialogs (part 1/2) (MCreator#531) * Externalized AI conditions and NewModElement dialogs * Externalized texture selector and code errors dialogs * Externalized element order editor and file dialogs * Externalized java animation and item selectors * Modified double quotes to fit better * Translated some java animation editor dialogs * New Crowdin updates (MCreator#562) * New translations texts.properties (French) * New translations texts.properties (Portuguese, Brazilian) * New translations texts.properties (Chinese Simplified) * New translations texts.properties (Chinese Traditional) * New translations texts.properties (Russian) * Add block and item on data list and mappings * Added stepsounds mappings for 1.16.4 and some datalist changes Signed-off-by: KlemenDEV <klemen.pylo@gmail.com> * Added enchantment support for #4 Signed-off-by: KlemenDEV <klemen.pylo@gmail.com> * Added creative tab mod element for #4 Signed-off-by: KlemenDEV <klemen.pylo@gmail.com> * Added fuel mod element for #4 Signed-off-by: KlemenDEV <klemen.pylo@gmail.com> * Added tag mod element for #4 and verified for #6 Signed-off-by: KlemenDEV <klemen.pylo@gmail.com> * Added armor mod element for #4 and knockback resistance parameter to it Signed-off-by: KlemenDEV <klemen.pylo@gmail.com> * Add netherite tool icons MCreator#564 * Added ranged item mod element for #4 Signed-off-by: KlemenDEV <klemen.pylo@gmail.com> * Add biome and achievement mappings * Added tool mod element for #4 Signed-off-by: KlemenDEV <klemen.pylo@gmail.com> * Add sound mappings #4 * Add entity mappings #4 Update entity list * Improved Gradle task display Signed-off-by: KlemenDEV <klemen.pylo@gmail.com> * Updated Gradle and some libraries Signed-off-by: KlemenDEV <klemen.pylo@gmail.com> * Updated bundled Java to version OpenJDK 8u275 Signed-off-by: KlemenDEV <klemen.pylo@gmail.com> * Add mappings for MCreator Link, 1.16.x Data Packs and Add-Ons #4 * New externalized dialogs (part 2/2) (MCreator#565) * Externalized ID dialogs * Externalized Variables dialogs * Externalized Sounds dialogs * Externalized Texture import dialogs * Externalized Textures mappings dialogs * Externalized Update notify dialogs * Fixed space and made some keys more conventionals * New Crowdin updates (MCreator#566) * New translations texts.properties (French) * New translations texts.properties (German) * New translations texts.properties (Vietnamese) * Added recipe mod element to 1.16.4 Signed-off-by: KlemenDEV <klemen.pylo@gmail.com> * New Crowdin updates (MCreator#567) * New translations texts.properties (French) * New translations texts.properties (German) * New translations texts.properties (Vietnamese) * Updated GUI mod element for 1.16.4 (#4) Signed-off-by: KlemenDEV <klemen.pylo@gmail.com> * Forge 1.16.4 - Food mod element (MCreator#555) * update (#16) * Improved help tip to resolve confusion as appeared in https://mcreator.net/forum/67868/act-ladders-not-working Signed-off-by: KlemenDEV <klemen.pylo@gmail.com> * Updated some dependencies to fix some bugs in the used libs and improve stability Signed-off-by: KlemenDEV <klemen.pylo@gmail.com> * New translations texts.properties (French) (MCreator#510) * Fix stamp tool offset. * Externalized Blockly panels components and reorganized some strings (MCreator#495) * Externalized CompileNotesPanel * Externalized default trigger * Removed duplicate intro comment from ProcedureTemplateDropdown * Externalized AITasksEditorToolbar * Externalized ProcedureEditorToolbar * Added new keys and reorganized some existing strings * Added new strings Co-authored-by: KlemenDEV <klemen.pylo@gmail.com> * Clarified xp result (MCreator/Generator-Forge-1.12.2#20) Signed-off-by: KlemenDEV <klemen.pylo@gmail.com> * New Crowdin updates (MCreator#512) * New translations texts.properties (French) * New translations texts.properties (Portuguese, Brazilian) * New translations texts.properties (Chinese Simplified) * New translations texts.properties (Chinese Traditional) * New translations texts.properties (German) * New translations texts.properties (Russian) * New translations texts.properties (Vietnamese) * New translations texts.properties (Polish) * Fixed MCreator#507 ("Affected by fortune" checkbox under loot tables is not working) + improved loot table tests Signed-off-by: KlemenDEV <klemen.pylo@gmail.com> * New texture templates (MCreator#514) * Code reformat, fixed one wrong externalization use case Signed-off-by: KlemenDEV <klemen.pylo@gmail.com> * New Crowdin updates (MCreator#517) * New translations texts.properties (French) * New translations texts.properties (Portuguese, Brazilian) * New translations texts.properties (Chinese Simplified) * New translations texts.properties (Chinese Traditional) * New translations texts.properties (Russian) * New translations texts.properties (Vietnamese) * New translations texts.properties (Polish) * New Crowdin updates (MCreator#524) * New translations texts.properties (Portuguese, Brazilian) * New translations texts.properties (German) * New translations texts.properties (Vietnamese) (MCreator#527) * New translations texts.properties (French) (MCreator#533) * New translations texts.properties (Polish) (MCreator#536) * Fixed MCreator#535 Signed-off-by: KlemenDEV <klemen.pylo@gmail.com> * Removed help button that appeared in procedure editor after Blockly update (Fixes MCreator#538) Signed-off-by: KlemenDEV <klemen.pylo@gmail.com> * Fixed datalist mistake Signed-off-by: KlemenDEV <klemen.pylo@gmail.com> * New translations texts.properties (Vietnamese) (MCreator#541) Co-authored-by: KlemenDEV <klemen.pylo@gmail.com> Co-authored-by: Matej <matej2000@gmail.com> Co-authored-by: Defeatomizer <drag7398@gmail.com> * Added food mod element Co-authored-by: KlemenDEV <klemen.pylo@gmail.com> Co-authored-by: Matej <matej2000@gmail.com> Co-authored-by: Defeatomizer <drag7398@gmail.com> * Generified class requirement for mod element type registry Signed-off-by: KlemenDEV <klemen.pylo@gmail.com> * Updated advancement to 1.16.4 (#4) and minor UI improvement for advancement maker Signed-off-by: KlemenDEV <klemen.pylo@gmail.com> * New Crowdin updates (MCreator#572) * New translations texts.properties (Portuguese, Brazilian) * New translations texts.properties (Vietnamese) * Updated structure mod element to 1.16.4 (#4) and place structure procedure Signed-off-by: KlemenDEV <klemen.pylo@gmail.com> * Ported some location related procedure blocks to 1.16.4 (#4) Signed-off-by: KlemenDEV <klemen.pylo@gmail.com> * New Crowdin updates (MCreator#577) * New translations texts.properties (French) * New translations texts.properties (Chinese Simplified) * Reverted changes for TextureImportDialogs Co-authored-by: Klemen <klemen.pylo@gmail.com> Co-authored-by: Matej <matej2000@gmail.com> Co-authored-by: Goldorion <38427877+Goldorion@users.noreply.github.com> Co-authored-by: Defeatomizer <drag7398@gmail.com>
AlsoSomeoneElse
pushed a commit
that referenced
this pull request
Dec 12, 2020
* Dimension mod element base for 1.16.4 (#4) Signed-off-by: KlemenDEV <klemen.pylo@gmail.com> * Dimension switch procedure for 1.16.4 (#4) Signed-off-by: KlemenDEV <klemen.pylo@gmail.com> * Minor fix in tp procedure and new POI registration code Signed-off-by: KlemenDEV <klemen.pylo@gmail.com> * Added dimension support to data packs (#6) Signed-off-by: KlemenDEV <klemen.pylo@gmail.com> * Fixed missing property for fluids in dimensions Signed-off-by: KlemenDEV <klemen.pylo@gmail.com> * Added dimension procedures and triggers for 1.16.4 and implemented new condition system for dimension type as int is no longer used 1.16.4+ Signed-off-by: KlemenDEV <klemen.pylo@gmail.com> * Ported new dimension tye system for 1.15.2 Signed-off-by: KlemenDEV <klemen.pylo@gmail.com> * Changed behaviour in 1.15.2 to match 1.16.4 regarding weather setting Signed-off-by: KlemenDEV <klemen.pylo@gmail.com> * Added portal support Signed-off-by: KlemenDEV <klemen.pylo@gmail.com>
AlsoSomeoneElse
pushed a commit
that referenced
this pull request
Dec 21, 2020
AlsoSomeoneElse
pushed a commit
that referenced
this pull request
Jul 14, 2023
* Update ai_path_node_type.md * Update beacon_color_modifier.md * Update bind_gui.md * Update block_sound.md * Update bounding_box.md * Update creative_pick_item.md * Update drop_amount.md * Update drop_inventory_items.md * Update unbreakable.md * Update when_added.md * Update when_entity_walks_on.md * Fix outrageous errors in Simplified Chinese!! (#2) * fixed * Update display_condition.md * Update base_texture.md * Update overlay_target.md * Update rendering_priority.md * Update display_condition.md (#3) * command * common * dimension * enchantment * feature * entity * fluid * function * name * gui * item * item_extension * keybinding * loottable * musicdisc * overlay * painting * recipe * structure * villagertrades * Create custom_property_name.md (#7) add * add (#6) add new help tip!!!!!! * chinese translation fix and add some external link (#4) * fix * Update generation_shape.md * Update harvest_level.md * Update coverage_estimate.md * Update default_features.md * Update toughness.md * update zh_TW * amend biome * block * common * dimension * enchantment * entity * fluid * gui * item * painting * particle * recipe --------- Co-authored-by: Jin1358 <126249552+Jin1358@users.noreply.github.com> Co-authored-by: cdc <63762187+cdc12345@users.noreply.github.com>
AlsoSomeoneElse
pushed a commit
that referenced
this pull request
Aug 8, 2023
* Update ai_path_node_type.md * Update beacon_color_modifier.md * Update bind_gui.md * Update block_sound.md * Update bounding_box.md * Update creative_pick_item.md * Update drop_amount.md * Update drop_inventory_items.md * Update unbreakable.md * Update when_added.md * Update when_entity_walks_on.md * Fix outrageous errors in Simplified Chinese!! (#2) * fixed * Update display_condition.md * Update base_texture.md * Update overlay_target.md * Update rendering_priority.md * Update display_condition.md (#3) * command * common * dimension * enchantment * feature * entity * fluid * function * name * gui * item * item_extension * keybinding * loottable * musicdisc * overlay * painting * recipe * structure * villagertrades * Create custom_property_name.md (#7) add * add (#6) add new help tip!!!!!! * chinese translation fix and add some external link (#4) * fix * Update generation_shape.md * Update harvest_level.md * Update coverage_estimate.md * Update default_features.md * Update toughness.md * update zh_TW * amend biome * block * common * dimension * enchantment * entity * fluid * gui * item * painting * particle * recipe * Update category.md (#8) * plant * Update gen_height.md * Update is_bonemealable.md * Update gen_height.md * Update gen_height.md --------- Co-authored-by: Jin1358 <126249552+Jin1358@users.noreply.github.com> Co-authored-by: cdc <63762187+cdc12345@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.