Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update fork #3

Merged
merged 62 commits into from Sep 26, 2020
Merged

Update fork #3

merged 62 commits into from Sep 26, 2020

Conversation

AlsoSomeoneElse
Copy link
Owner

No description provided.

@AlsoSomeoneElse AlsoSomeoneElse merged commit f7ec02a into AlsoSomeoneElse:master Sep 26, 2020
AlsoSomeoneElse pushed a commit that referenced this pull request Nov 4, 2020
Fixed food not healing hunger if they had a result item and made the …
AlsoSomeoneElse pushed a commit that referenced this pull request Nov 4, 2020
AlsoSomeoneElse pushed a commit that referenced this pull request Dec 12, 2020
Ported all new block bases (#3 and #54) to 1.16.4
AlsoSomeoneElse pushed a commit that referenced this pull request Sep 8, 2021
* 10 global triggers

* Port some block and item global triggers to 1.17.1 (MCreator#1682) (#3)

* Add some block and item related triggers

* Fix triggers

* Improved generated code for global triggers for 1.17.x

* Improved generated code for global triggers for 1.17.x (fix template)

* Update misc.xml

It appears no matter what I'm doing.

* Fix dependencies

Co-authored-by: KlemenDEV <klemen.pylo@gmail.com>

Co-authored-by: KlemenDEV <klemen.pylo@gmail.com>

* Fix triggers

* Revert "Port some block and item global triggers to 1.17.1 (MCreator#1682) (#3)"

This reverts commit cb29acd.

* Fix 2 triggers

* Code cleanup

* Some improvements

Co-authored-by: KlemenDEV <klemen.pylo@gmail.com>
Co-authored-by: KlemenDEV <16374228+KlemenDEV@users.noreply.github.com>
AlsoSomeoneElse added a commit that referenced this pull request May 17, 2023
* Create category.md

* Create dictionary.md

* Create height_variation.md

* update advancement

* update armor

* update block

* command

* common

* dimension

* enchantment

* energy

* entity

* fluid

* fluidtank

* function

* gamerule

* GUI

* item

* loottable

* musicdisc

* overlay

* painting

* tab

* tag

* Update namespace.md

* Update namespace.md

安息吧协助翻译

* Delete height_variation.md

* Update has_transparency.md

* Update name.md

* Update disable_offset.md

* Update display_tick_update.md

* Update drop_amount.md

* Update drop_inventory_items.md

* Update emissive_rendering.md

* Update emits_redstone.md

* Update enable_pitch.md

* Update enchantments_bonus.md

* Update fall_sound.md

* Update fire_spread_speed.md

* Update flammability.md

* Update generation_condition.md

* Update generation_shape.md

* Update hardness.md

* harvest

* when

* gen

* has

* Update hit_sound.md

* Update input_slots.md

* inventory

* is

* Update item_texture.md

* Update jump_factor.md

* Update light_opacity.md

* Update luminance.md

* Update material.md

* Update model.md

* Update permission_level.md

* Update offset_type.md

* All remaining files in the block

* Delete untranslated files from the item

* Update namespace.md

* tool

* recipe

* keybinding

* villagertrades

* item_extension

* potion

* item when

* item on

* item container

* item food

* Create bind_gui.md

* Create can_destroy_any_block.md

* Create condition_glow.md

* Create damage_vs_entity.md

* Create destroy_speed.md

* Create burn_time.md

* Create dispense_success_condition.md

* Create has_dispense_behavior.md

* correct translation errors

* biome

* 导入文件

* feature

* gui

* item

* Villager Profession (#1)

* Villager Profession

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Goldorion <38427877+Goldorion@users.noreply.github.com>
Co-authored-by: KlemenDEV <16374228+KlemenDEV@users.noreply.github.com>
Co-authored-by: Defeatomizer <drag7398@gmail.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: AlsoSomeoneElse <64546452+AlsoSomeoneElse@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: NerdyPuzzle <112079900+NerdyPuzzle@users.noreply.github.com>
Co-authored-by: Matej <matej2000@gmail.com>
Co-authored-by: kleiders3010 <71478358+kleiders3010@users.noreply.github.com>
Co-authored-by: Max094Reikeb <49318596+Max094Reikeb@users.noreply.github.com>

* Revert "Villager Profession (#1)" (#2)

This reverts commit c02455d.

* structure

Here are some missing uncommitted files. In the new version of Minecraft, the structure blocks were modified, but they were not updated in time, so I changed the values in the English structure.md

* Restore the English changes

* 台湾繁体中文tooltip (#3)

* 台湾繁体中文tooltip (#3)

* Villager Profession (#4)

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: cdc <63762187+cdc12345@users.noreply.github.com>
Co-authored-by: Goldorion <38427877+Goldorion@users.noreply.github.com>
Co-authored-by: KlemenDEV <16374228+KlemenDEV@users.noreply.github.com>
Co-authored-by: Defeatomizer <drag7398@gmail.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: AlsoSomeoneElse <64546452+AlsoSomeoneElse@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: NerdyPuzzle <112079900+NerdyPuzzle@users.noreply.github.com>
Co-authored-by: Matej <matej2000@gmail.com>
Co-authored-by: kleiders3010 <71478358+kleiders3010@users.noreply.github.com>
Co-authored-by: Max094Reikeb <49318596+Max094Reikeb@users.noreply.github.com>
Co-authored-by: Jin1358 <126249552+Jin1358@users.noreply.github.com>
AlsoSomeoneElse added a commit that referenced this pull request May 23, 2023
* Create category.md

* Create dictionary.md

* Create height_variation.md

* update advancement

* update armor

* update block

* command

* common

* dimension

* enchantment

* energy

* entity

* fluid

* fluidtank

* function

* gamerule

* GUI

* item

* loottable

* musicdisc

* overlay

* painting

* tab

* tag

* Update namespace.md

* Update namespace.md

安息吧协助翻译

* Delete height_variation.md

* Update has_transparency.md

* Update name.md

* Update disable_offset.md

* Update display_tick_update.md

* Update drop_amount.md

* Update drop_inventory_items.md

* Update emissive_rendering.md

* Update emits_redstone.md

* Update enable_pitch.md

* Update enchantments_bonus.md

* Update fall_sound.md

* Update fire_spread_speed.md

* Update flammability.md

* Update generation_condition.md

* Update generation_shape.md

* Update hardness.md

* harvest

* when

* gen

* has

* Update hit_sound.md

* Update input_slots.md

* inventory

* is

* Update item_texture.md

* Update jump_factor.md

* Update light_opacity.md

* Update luminance.md

* Update material.md

* Update model.md

* Update permission_level.md

* Update offset_type.md

* All remaining files in the block

* Delete untranslated files from the item

* Update namespace.md

* tool

* recipe

* keybinding

* villagertrades

* item_extension

* potion

* item when

* item on

* item container

* item food

* Create bind_gui.md

* Create can_destroy_any_block.md

* Create condition_glow.md

* Create damage_vs_entity.md

* Create destroy_speed.md

* Create burn_time.md

* Create dispense_success_condition.md

* Create has_dispense_behavior.md

* correct translation errors

* biome

* 导入文件

* feature

* gui

* item

* Villager Profession (#1)

* Villager Profession

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Goldorion <38427877+Goldorion@users.noreply.github.com>
Co-authored-by: KlemenDEV <16374228+KlemenDEV@users.noreply.github.com>
Co-authored-by: Defeatomizer <drag7398@gmail.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: AlsoSomeoneElse <64546452+AlsoSomeoneElse@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: NerdyPuzzle <112079900+NerdyPuzzle@users.noreply.github.com>
Co-authored-by: Matej <matej2000@gmail.com>
Co-authored-by: kleiders3010 <71478358+kleiders3010@users.noreply.github.com>
Co-authored-by: Max094Reikeb <49318596+Max094Reikeb@users.noreply.github.com>

* Revert "Villager Profession (#1)" (#2)

This reverts commit c02455d.

* structure

Here are some missing uncommitted files. In the new version of Minecraft, the structure blocks were modified, but they were not updated in time, so I changed the values in the English structure.md

* Restore the English changes

* 台湾繁体中文tooltip (#3)

* 台湾繁体中文tooltip (#3)

* Villager Profession (#4)

* block中文修正

* Update icon.md

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: cdc <63762187+cdc12345@users.noreply.github.com>
Co-authored-by: Goldorion <38427877+Goldorion@users.noreply.github.com>
Co-authored-by: KlemenDEV <16374228+KlemenDEV@users.noreply.github.com>
Co-authored-by: Defeatomizer <drag7398@gmail.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: AlsoSomeoneElse <64546452+AlsoSomeoneElse@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: NerdyPuzzle <112079900+NerdyPuzzle@users.noreply.github.com>
Co-authored-by: Matej <matej2000@gmail.com>
Co-authored-by: kleiders3010 <71478358+kleiders3010@users.noreply.github.com>
Co-authored-by: Max094Reikeb <49318596+Max094Reikeb@users.noreply.github.com>
Co-authored-by: Jin1358 <126249552+Jin1358@users.noreply.github.com>
AlsoSomeoneElse added a commit that referenced this pull request Jun 8, 2023
* Create category.md

* Create dictionary.md

* Create height_variation.md

* update advancement

* update armor

* update block

* command

* common

* dimension

* enchantment

* energy

* entity

* fluid

* fluidtank

* function

* gamerule

* GUI

* item

* loottable

* musicdisc

* overlay

* painting

* tab

* tag

* Update namespace.md

* Update namespace.md

安息吧协助翻译

* Delete height_variation.md

* Update has_transparency.md

* Update name.md

* Update disable_offset.md

* Update display_tick_update.md

* Update drop_amount.md

* Update drop_inventory_items.md

* Update emissive_rendering.md

* Update emits_redstone.md

* Update enable_pitch.md

* Update enchantments_bonus.md

* Update fall_sound.md

* Update fire_spread_speed.md

* Update flammability.md

* Update generation_condition.md

* Update generation_shape.md

* Update hardness.md

* harvest

* when

* gen

* has

* Update hit_sound.md

* Update input_slots.md

* inventory

* is

* Update item_texture.md

* Update jump_factor.md

* Update light_opacity.md

* Update luminance.md

* Update material.md

* Update model.md

* Update permission_level.md

* Update offset_type.md

* All remaining files in the block

* Delete untranslated files from the item

* Update namespace.md

* tool

* recipe

* keybinding

* villagertrades

* item_extension

* potion

* item when

* item on

* item container

* item food

* Create bind_gui.md

* Create can_destroy_any_block.md

* Create condition_glow.md

* Create damage_vs_entity.md

* Create destroy_speed.md

* Create burn_time.md

* Create dispense_success_condition.md

* Create has_dispense_behavior.md

* correct translation errors

* biome

* 导入文件

* feature

* gui

* item

* Villager Profession (#1)

* Villager Profession

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Goldorion <38427877+Goldorion@users.noreply.github.com>
Co-authored-by: KlemenDEV <16374228+KlemenDEV@users.noreply.github.com>
Co-authored-by: Defeatomizer <drag7398@gmail.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: AlsoSomeoneElse <64546452+AlsoSomeoneElse@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: NerdyPuzzle <112079900+NerdyPuzzle@users.noreply.github.com>
Co-authored-by: Matej <matej2000@gmail.com>
Co-authored-by: kleiders3010 <71478358+kleiders3010@users.noreply.github.com>
Co-authored-by: Max094Reikeb <49318596+Max094Reikeb@users.noreply.github.com>

* Revert "Villager Profession (#1)" (#2)

This reverts commit c02455d.

* structure

Here are some missing uncommitted files. In the new version of Minecraft, the structure blocks were modified, but they were not updated in time, so I changed the values in the English structure.md

* Restore the English changes

* 台湾繁体中文tooltip (#3)

* 台湾繁体中文tooltip (#3)

* Villager Profession (#4)

* block中文修正

* Update icon.md

* taiwan item (#9)

* biome中文修正

* armor中文修正

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: cdc <63762187+cdc12345@users.noreply.github.com>
Co-authored-by: Goldorion <38427877+Goldorion@users.noreply.github.com>
Co-authored-by: KlemenDEV <16374228+KlemenDEV@users.noreply.github.com>
Co-authored-by: Defeatomizer <drag7398@gmail.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: AlsoSomeoneElse <64546452+AlsoSomeoneElse@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: NerdyPuzzle <112079900+NerdyPuzzle@users.noreply.github.com>
Co-authored-by: Matej <matej2000@gmail.com>
Co-authored-by: kleiders3010 <71478358+kleiders3010@users.noreply.github.com>
Co-authored-by: Max094Reikeb <49318596+Max094Reikeb@users.noreply.github.com>
Co-authored-by: Jin1358 <126249552+Jin1358@users.noreply.github.com>
AlsoSomeoneElse pushed a commit that referenced this pull request Jun 11, 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)

---------

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 Jun 19, 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

---------

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 Jun 27, 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

---------

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 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
Labels
None yet
Projects
None yet
6 participants