chmodsayshello
/
MineClone2
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update fork #6

Merged
chmodsayshello merged 260 commits from VoxeLibre/VoxeLibre:master into master 2022-05-29 21:37:34 +02:00
Conversation 0 Commits 260 Files Changed 431 +9550 -6756
chmodsayshello commented 2022-05-29 21:37:09 +02:00
Owner
Copy Link
No description provided.
chmodsayshello added 260 commits 2022-05-29 21:37:10 +02:00
ed8995acec Fix `add_large_plant()` argument mismatch. 
* In commit 86b2cd70f9 an extra argument
  was added to the `add_large_plant()` function in order to handle silk
  touch.  For some reason, the callers for "double_grass" and
  "double_fern" were updated with two new arguments.  Because of this,
  silk touch likely never worked on these nodes.  This commit removes
  the unused `nil` argument from both callers.
* This commit fixes #2155.
390802a344 fix crash when achievements are disabled and /awards is being used 
This commit fixes  MineClone2/MineClone2#2164, which crashes the game whenever /awards is called with arguments other than enable
b0ae135b3c Add `cobble` group. 
* Add `cobble` group to GROUPS.md, to be used in crafting recipes.
64bb50dfd5 Change some crafting recipes to use group:cobble. 
* Update crafting recipes for stone tools (pick, shovel, axe, sword and
hoe), furnace and brewing stand to use any cobble group stone.
f1a494ea62 Change stone tool repair materal to group:cobble. 
* Update repair material for stone tools (pick, shovel, axe, sword and
  hoe) to use any cobble group stone.
dab80c45fd Merge pull request 'Add "cobble" group.' (#2174) from cobble_group into master 
Reviewed-on: MineClone2/MineClone2#2174
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
Reviewed-by: cora <cora@noreply.git.minetest.land>
e10c06ba98 Merge pull request 'Remove 2D preview + fix enchanting overlay (Fix #1869, #2161)' (#2162) from remove_3d_preview into master 
Reviewed-on: MineClone2/MineClone2#2162
Reviewed-by: kabou <kabou@noreply.git.minetest.land>
Reviewed-by: cora <cora@noreply.git.minetest.land>
b0b8ef3921 Comment out ore registrations for now 
The discussion about how to handle the new ores is still ongoing.
This PR was originally only intended to add the new nodes so
that's what it does now.
f5abc28190 Allow smelting of deepslate ores. 
* Register "cooking" crafting recipe for deepslate ores that enables
  smelting these ores in furnaces.
* Extend deepslate ore registration function to allow passing cooking
  result as argument.
* Update the deepslate ore table to include smelting results.
* Put deepslate w/ lapis drops in a separate table, making the deepslate
  ores table less unwieldly.
1266396e1d Add cobbled deepslate to cobble group. 
By adding cobbled deepslate to the group "cobble", it automatically
inherits  all crafting recipes and tool repair capabilities that apply
to that group.

* Add `cobble=1` to cobbled deepslate node definition groups.  This
  requires a little refactoring of the deepslate variants registration
  function.
* Remove stone tools, furnace and brewing stand crafting recipes.
794e10df4e [mcl_amethyst] INIT 
* Amethyst Block
* Budding Amethyst (won't  grow amethyst now)
* New spyglass recipe
* Tinted Glass
* Calcite
31a8ddabb8 minor changed (see long description) 
This commit makes charged respawn anchors light sources, all respawn anchors can no longer be pushed by pistons and always drop the uncharged one
e8e565fc06 Merge pull request 'Add Respawn Anchor (PR with branch in mcl2 repo)' (#2188) from respawn_anchor into master 
Reviewed-on: MineClone2/MineClone2#2188
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
Reviewed-by: cora <cora@noreply.git.minetest.land>
4e3a2a7b4c Fix list of spawnable biomes for rabbits. 
* Rabbits spawn in Desert biome.
* Rabbits do no spawn in Forest and Swamp biomes.
44b1d583a7 Potion Fixes: 
Ensure all potion icons disappear after their effect is gone.
Stop Breath bar from flashing when water_breathing is in effect.
46dbf8c0ab Spawn villagers on villagegen, stay in village 
This spawns a villager per bed on village gen and saves the bed
position in the entity. If it moves too far from the village
it gets teleported (for now) back.
4d342b8365 Merge pull request 'Village(r)s update' (#2189) from villager_spawning into master 
Reviewed-on: MineClone2/MineClone2#2189
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
a8c231da34 Refactor compass code. 
* Split up `get_compass_image()` into smaller functions.  This allows
  for better code sharing between old and new API and globalstep fn.
* Add `get_compass_itemname()` function.  It will be the new API of
  choice, `get_compass_image() will be deprecated soon.
* Remove function declaration out of globalstep function.
* Various other performance improvements.
* Add local aliases for global functions
* Lodestone compasses can only stack 1 item.
* Document functions and variables.
* Fix lodetone compass inaccurately reusing compass descriptions.
* Add usage descriptions to node definitions
* Refactor craftitem registration code.
* Update translation templates.
8a4b8707fa Add new compass API. 
* Add API.md
* Update mcl_itemframes to use the new API.
* Revert old exported function back to original API.
bacc7613b5 Fix crash in mt 5.4 with vector ops. 
* `vector.from_string()` is not available in mt pre-5.5.  Replace with
  `minetest.string_to_pos()`.
aca4aca79b Add German translation. 
* Add "de" (German) translation by chmodsayshello.
8ae605165b Fix lodestone compass stack_max. 
* Lodestone compasses are stackable.
* Remove hardcoded `stack_max` setting, use default.
14c882f982 Fix lodestone compass meta handling. 
* The nature of a compass was being determined by looking at its meta.
  This caused lodestone compasses with unset meta to turn into regular
  compasses.  Fixed by using string matching on the itemname.
* Changed lodestone rightclick handler to explicitly set the correct
  name and frame of the compass used on it instead of waiting for
  globalstep to do this.
74e70b674e Fix return value of `get_compass_image()`. 
* `get_compass_image()` did not actually return the image number.
872b708465 Remove unused variable. 
* Removed unused variable `stack_max`.
baf8e0b79c Update item entity for lodestone compass. 
* Added another special case to the item entity registration for
  lodestone compasses, without this a dropped lodestone compass would
  turn into a regular compass on being dropped.
* Update the compass and lodestone compass frame number to be the
  stereotype frame.
729159f631 Merge pull request 'Refactor compass code.' (#2197) from get-compass-image-fix into master 
Reviewed-on: MineClone2/MineClone2#2197
Reviewed-by: cora <cora@noreply.git.minetest.land>
Reviewed-by: chmodsayshello <chmodsayshello@hotmail.com>
dd1a58b01e Implement piston fixes: 
This enables the feature of unsticky pistons. This allows
for some nodes to be unpullable, but otherwise pushable or diggable.
A certain selection of nodes that can never be moved.
And, stops certain entities from being pushed if they shouldn't move.

Along with this change; I've also updated the rules regarding
pushing, and pulling of nodes & objects to be more accurate to MC.
Now allowing for more complex redstone circuits to be built.
1ba12aec60 Add new textures, make bell a nodebox 
thx erlehmann for the nodebox <3
12bc8f1a3b initial pathfinding experiments 
to test rightclick a villager and it will try to path find to
0,9,0 (i'm using flat mapgen for testing for now).
fca259c074 fix crash during (artificial) village creation 
when using the village tool doing that on an unsuitable location
would result in no position for the belltower being available
this checks for that and ... doesn't crash then ^^
d34191f00c villagers go to the bell if it's rung(for now) 
this will help with further testing pathfinding until villagers
get a proper schedule and do more things
60c463b8f9
Run tools/generate_ingame_credits.lua 
This should be run every time CREDITS.md is changed.
23e5a1c7d3 Comment out ore generation for now 
The discussion about how to handle this is still ongoing. Since
this is about getting the new nodes disable ore registration
for now.
1931a85f24 Add blackstone to cobble group. 
By adding blackstone to the group "cobble", it automatically inherits
all crafting recipes and tool repair capabilities that apply to that
group.

* Add `cobble=1` to blackstone node definition groups.
* Remove stone tools and furnace crafting recipes.
chmodsayshello merged commit a6a4c675d1 into master 2022-05-29 21:37:34 +02:00
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
1 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: chmodsayshello/MineClone2#6
No description provided.
Delete Branch "VoxeLibre/VoxeLibre:master"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?