From f87c24a71b73028a987c38a760e783a9aca4cb21 Mon Sep 17 00:00:00 2001 From: gnembon Date: Sun, 21 Jun 2020 23:06:41 -0300 Subject: [PATCH 1/3] slash fixes #339 --- docs/scarpet/Documentation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/scarpet/Documentation.md b/docs/scarpet/Documentation.md index 99556222..d56ad074 100644 --- a/docs/scarpet/Documentation.md +++ b/docs/scarpet/Documentation.md @@ -32,7 +32,7 @@ [Events](/docs/scarpet/api/Events.md) -[Scoreboard manipulation](docs/scarpet/api/Scoreboard.md) +[Scoreboard manipulation](/docs/scarpet/api/Scoreboard.md) [Auxiliary Functions](/docs/scarpet/api/Auxiliary.md) From 8b395e43b97e8ccfec81f2b614b3683b797a2c1a Mon Sep 17 00:00:00 2001 From: gnembon Date: Sun, 21 Jun 2020 23:12:35 -0300 Subject: [PATCH 2/3] carpet 1.4 rc-1 --- gradle.properties | 4 ++-- src/main/java/carpet/CarpetSettings.java | 2 +- src/main/resources/fabric.mod.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index 21a06bdd..9f1626d7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,10 +6,10 @@ org.gradle.jvmargs=-Xmx1G # or better: https://modmuss50.me/fabric.html minecraft_version=1.15.2 yarn_mappings=1.15.2+build.17 - loader_version=0.8.7+build.201 + loader_version=0.8.8+build.202 # Mod Properties - mod_version = 1.3.32+v200617 + mod_version = 1.3.33+v200621 maven_group = carpet archives_base_name = fabric-carpet diff --git a/src/main/java/carpet/CarpetSettings.java b/src/main/java/carpet/CarpetSettings.java index eb930cc1..c39cd6f1 100644 --- a/src/main/java/carpet/CarpetSettings.java +++ b/src/main/java/carpet/CarpetSettings.java @@ -34,7 +34,7 @@ import static carpet.settings.RuleCategory.CLIENT; @SuppressWarnings("CanBeFinal") public class CarpetSettings { - public static final String carpetVersion = "1.3.32+v200617"; + public static final String carpetVersion = "1.3.33+v200621"; public static final Logger LOG = LogManager.getLogger(); public static boolean skipGenerationChecks = false; public static boolean impendingFillSkipUpdates = false; diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 47b892d0..62c70f65 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,7 +1,7 @@ { "schemaVersion": 1, "id": "carpet", - "version": "1.3.32", + "version": "1.3.33", "name": "Carpet Mod in Fabric", "description": "Carpet made out of fabric", From 0899717734748745524b604bfc806fc11624fe42 Mon Sep 17 00:00:00 2001 From: gnembon Date: Sun, 21 Jun 2020 23:17:49 -0300 Subject: [PATCH 3/3] marking final 1.7 scarpet API content --- .../editors/npp/scarpet_v1.7_notepad++.xml | 152 ++++++++++++++++++ 1 file changed, 152 insertions(+) create mode 100644 docs/scarpet/resources/editors/npp/scarpet_v1.7_notepad++.xml diff --git a/docs/scarpet/resources/editors/npp/scarpet_v1.7_notepad++.xml b/docs/scarpet/resources/editors/npp/scarpet_v1.7_notepad++.xml new file mode 100644 index 00000000..ffb50e58 --- /dev/null +++ b/docs/scarpet/resources/editors/npp/scarpet_v1.7_notepad++.xml @@ -0,0 +1,152 @@ + + + + + + + + 00// 01 02 03 04 + 0x + + + + + + + ; + - * / % ^ && || > >= < <= == != = += -> <> ! ~ , : + + ( + + ) + + + + + + + + not fact rand + sin cos tan asin acos atan atan2 sinh cosh tanh sec csc sech csch cot acot coth asinh acosh atanh + rad deg + log log10 log1p + sqrt + max min abs round floor ceil + mandelbrot relu + perlin simplex + + print return exit throw try + + task task_count task_value task_join task_completed synchronize task_dock + + system_variable_get system_variable_set + + l join split slice sort sort_key range m keys values pairs copy + + get put has delete + + var undef vars if loop map filter first all c_for for while reduce continue break + + import call outer type hash_code bool number str length rand sleep time profile_expr lower upper title replace replace_first + + + block pos pos_offset solid air liquid flammable + transparent opacity blocks_daylight emitted_light light block_light sky_light see_sky brightness + hardness blast_resistance top loaded suffocates power ticks_randomly update block_tick random_tick in_slime_chunk + set without_updates + blocks_movement block_sound material map_colour property block_properties block_data poi set_poi + place_item set_biome biome loaded_status generation_status inhabited_time spawn_potential chunk_tickets + structure_eligibility structures structure_references set_structure reset_chunk reload_chunk + add_chunk_ticket + + scoreboard scoreboard_add scoreboard_remove scoreboard_display + + player spawn entity_id entity_list entity_area entity_selector query modify entity_event + + stack_limit item_category recipe_data crafting_remaining_item + + inventory_size inventory_has_items inventory_get inventory_set inventory_find inventory_remove drop_item + + scan volume neighbours rect diamond + + format logger sound particle particle_line particle_rect + + run save tick_time world_time day_time last_tick_times game_tick seed current_dimension in_dimension view_distance + + plop harvest destroy schedule nbt draw_shape create_marker remove_all_markers + + load_app_data store_app_data escape_nbt statistic + + euler pi null true false + x y z p + _ _i _a _x _y _z + global_ + + __command + __config + __on_chunk_generated + __on_close + __on_player_attacks_entity + __on_player_breaks_block + __on_player_clicks_block + __on_player_changes_dimension + __on_player_chooses_recipe + __on_player_deploys_elytra + __on_player_drops_item + __on_player_drops_stack + __on_player_finishes_using_item + __on_player_interacts_with_block + __on_player_interacts_with_entity + __on_player_jumps + __on_player_places_block + __on_player_releases_item + __on_player_rides + __on_player_right_clicks_block + __on_player_starts_sneaking + __on_player_starts_sprinting + __on_player_stops_sneaking + __on_player_stops_sprinting + __on_player_switches_slot + __on_player_uses_item + __on_player_wakes_up + __on_statistic + __on_tick + __on_tick_ender + __on_tick_nether + __on_player_takes_damage + __on_player_deals_damage + __on_player_dies + __on_player_respawns + __on_player_disconnects + __on_player_connects + + $ + 00' 01\ 02' 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 + + + + + + + + + + + + + + + + + + + + + + + + + + + + +