TheOnlyJoeEnderman
/
MineClone2
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
10,159 Commits 47 Branches 73 Tags 105 MiB
Commit Graph

4508 Commits

Author SHA1 Message Date
kabou 7d8fdc6ec3 Separate brown dye from cocoa beans. 
* Add craftitem "mcl_cocoas:cocoa_beans".
* Add texture for brown dye item.
* Merge craftitem registration for "mcl_dye:brown" with generic dyes.
* Add crafting recipe for brown dye.
* Add legacy conversion recipe.
* Update dyes table.
* Update translations.
* Update cookie recipe.
 2022-12-29 03:08:49 +00:00
kabou d2edc75407 Separate blue dye from lapis lazuli. 
* Add craftitem "mcl_core:lapis".
* Add texture for blue dye item.
* Add crafting recipe for blue dye.
* Add legacy conversion recipe.
* Update dyes table.
* Update translations.
* Update lapis block crafting recipes.
* Update lapis ore drops.
* Update dungeon and shipwreck loot.
* Update enchanting table input.
* Update villager trade.
 2022-12-29 03:08:49 +00:00
kabou 7311071303 Separate black dye from squid ink sac. 
* Add craftitem "mcl_mobitems:ink_sac".
* Add texture for black dye item.
* Add crafting recipe for black dye.
* Add legacy conversion recipe.
* Update dyes table.
* Update translations.
* Update fishing loot.
 2022-12-29 03:08:49 +00:00
Michieal 28cb06421d Merge branch 'master' into mcl_bamboo_too 2022-12-28 18:13:51 -05:00
Michieal 731468cf5a Did a bit of code restructuring. 
Removed another magic number.
Add in todo for fishing.
Added in the possibility for bamboo to grow two nodes in one success.
Added in a "force" param to use with bonemealing.
 2022-12-28 18:10:12 -05:00
Michieal ff7693937a Did a bit of code restructuring. 
Removed another magic number.
Add in todo for fishing.
Added in the possibility for bamboo to grow two nodes in one success.
Added in a "force" param to use with bonemealing.
 2022-12-28 15:29:06 -05:00
Michieal 76669e1f3c Moved bamboo grow code to its own function, and made that function global so that it can be called outside of mcl_bamboo. 2022-12-28 14:34:14 -05:00
ancientmarinerdev 81daec14a2 Merge pull request 'Update sounds from MTG' (#3157) from grorp/MineClone2:patch-1 into master 
Reviewed-on: MineClone2/MineClone2#3157
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2022-12-27 21:36:33 +00:00
Michieal 6f05992c8b Fix Licensing. 
Removed Make_Stairs check.
Made unified protection check.
Began work on the second half of scaffolding.
Removed comments that was no longer needed.
 2022-12-25 07:30:31 -05:00
PrairieWind 0dc31611ac Merge pull request 'Adjusts mcl_crimson Doors to have a specified side texture' (#3140) from Wbjitscool/MineClone2:master into master 
Reviewed-on: MineClone2/MineClone2#3140
Reviewed-by: PrairieWind <prairie.astronomer1@gmail.com>
 2022-12-25 02:09:14 +00:00
3raven 5964f25fa7 Merge branch 'master' into master 2022-12-24 17:01:13 +00:00
3raven d3e8e24f42 Fix the disapearance of christmas texture of the ender chest once it is placed 
Fix the disapearance of christmas texture of the ender chest once it is placed
 2022-12-24 14:44:06 +00:00
Michieal c55332bf42 Change mod.conf and readme's depends. 
Optipng images, after adding in bamboo top image.
Try out a plantlike style top node for bamboo stalks.
Make Bamboo drop 1-2 bamboo.
Fix Bamboo top drops.
 2022-12-24 00:57:44 -05:00
Michieal 42f8fbf9b8 Added in Fuel Recipes for bamboo slabs / stairs; including mosaics. 
Finished Bamboo Mosaic nodes.
 2022-12-23 17:27:01 -05:00
Michieal b0978d275d Abstracted variables in bamboo abm. 
Fix Base scaffolding in Creative mode.
Fixed Lua Warnings.
 2022-12-22 16:08:05 -05:00
FossFanatic e1f26ea70d Remove dry grass side texture 
The same reason as why the dry grass top texture got removed.
 2022-12-22 12:40:36 +00:00
FossFanatic 9ef4a850b1 Remove dry grass top texture 
This is a remnant of Minetest Game and used to be for dry biomes before colour palettes were a thing in MineClone 2.
 2022-12-22 12:40:10 +00:00
FossFanatic 4c23601d03 Remove useless amethyst texture 
This texture is a remnant of the PixelPerfection resource pack and nowhere in the code does this texture get used.
 2022-12-22 12:38:05 +00:00
FossFanatic 8d51e16b8e Remove obsolete texture 2022-12-22 12:34:14 +00:00
Michieal 2b11b5c17a Added full node names for bamboo on_place. 
Added in bamboo top destruct.
Removed mapgen.lua.
 2022-12-21 22:23:46 -05:00
SakuraRiu 1b980849db Merge branch 'master' into master 2022-12-22 00:55:48 +00:00
Michieal e0d48400a7 Fix the removal of bamboo extras. 2022-12-21 16:16:53 -05:00
Michieal 742a625c42 Added in aliasing for scaffolding, to prevent breakage for players using the "mcl_scaffolding" mod. 2022-12-21 15:55:50 -05:00
Michieal 95d3f9be07 Make Lantern API callable from outside of mcl_lanterns 2022-12-21 12:34:47 -05:00
Michieal 16d94a88db moved extras to the proper location 2022-12-21 12:32:09 -05:00
Michieal b14f055154 Merge branch 'master' into mcl_bamboo_too 
# Conflicts:
#	mods/ITEMS/mcl_bamboo/init.lua
 2022-12-20 23:19:29 -05:00
Riu Sakura 3faa930bdc Added missing translations. 
In addition, the translation of "Grass Block" has been corrected to a better phrase.
 2022-12-21 10:24:26 +09:00
ancientmarinerdev a6e0da0e07 Merge pull request 'Fixes MineClone2/MineClone2#3120 | Complete re-upload of the mcl_bamboo branch.' (#3123) from mcl_bamboo_new into master 
Reviewed-on: MineClone2/MineClone2#3123
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2022-12-21 00:47:21 +00:00
Michieal 41ab80183e Darken the Warped Hyphae Log (side) texture 2022-12-20 18:02:48 -05:00
ancientmarinerdev 1c24adb714 Merge pull request 'Animated Nether Tree Textures' (#3155) from FossFanatic/MineClone2:animated_nether_trees_possible into master 
Reviewed-on: MineClone2/MineClone2#3155
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2022-12-20 21:19:45 +00:00
Michieal 7003459b8d Merge remote-tracking branch 'origin/master' 2022-12-20 16:13:54 -05:00
Michieal 8d440f8464 Made purple warped_hyphae trapdoor so that it matched the sides. (The top was green, the sides were purple.) 
Renamed the old trapdoor top to _alt.
 2022-12-20 16:13:07 -05:00
Gregor Parzefall 8522b87444 Removed two duplicated sound definitions 2022-12-20 21:08:59 +01:00
Gregor Parzefall e4abbbf112 Sound changes in code 2022-12-20 20:57:57 +01:00
Wbjitscool 1b4bcda9da Update 'mods/ITEMS/mcl_mangrove/init.lua' 2022-12-20 02:58:58 +00:00
Michieal 39714fb096 optipng the mangrove door sides, and then moved them to the textures directory for mcl_mangrove. 2022-12-19 21:48:51 -05:00
Wbjitscool 258a1534d2 Upload files to 'mods/ITEMS/mcl_mangrove' 2022-12-20 02:42:27 +00:00
Michieal c995c8418c Optipng'd mangrove textures 
cleaned up warped door (inv/wield images)
 2022-12-19 21:32:44 -05:00
Wbjitscool 00121d9d97 Upload files to 'mods/ITEMS/mcl_crimson/textures' 
fixed transperancy issue
 2022-12-20 02:18:15 +00:00
Michieal 4f90fbcedd put in green alt warped door textures. 
resized large textures to 16px textures.
optipng'd' them.
 2022-12-19 20:57:32 -05:00
Michieal c7104a6f72 Made the warped doors purple. 
Optipng'd all the textures in this module.
 2022-12-19 20:48:47 -05:00
Wbjitscool 223f6640d2 Upload files to 'mods/ITEMS/mcl_crimson/textures' 2022-12-20 01:36:25 +00:00
Michieal feea815604 Warped Hyphae textures update. 2022-12-20 01:32:36 +00:00
Riu Sakura b1b2e06dc7 Removed invisible character codes. 
Updated translations with the latest templates.
 2022-12-20 08:37:24 +09:00
Michieal 1a56a32fa8 misc. error fix 2022-12-19 16:16:54 -05:00
Michieal 66a7c5757e Made bamboo buttons flammable, and made them into a fuel source. 
Converted commented code snippet, addgroups() into global function.

Stairs will be a fuel source in part 2.
 2022-12-19 15:57:27 -05:00
FossFanatic 083a57a4a1 Allow for animated hyphae textures 2022-12-19 19:36:28 +00:00
FossFanatic c512d28f02 Add blackstone top texture 2022-12-19 19:02:18 +00:00
FossFanatic 1056b6ca14 Add blackstone side texture 2022-12-19 19:02:18 +00:00
FossFanatic c8ec57bdbd Delete 'mods/ITEMS/mcl_blackstone/textures/mcl_blackstone.png' 2022-12-19 19:02:18 +00:00
FossFanatic 2dffe11cdd Add seperate gilded blackstone texture 2022-12-19 19:02:18 +00:00
FossFanatic f29622dd59 Allow for both top/bottom and side textures 2022-12-19 19:02:18 +00:00
FossFanatic d9bd3e2601 Add seperate nether gold ore texture 2022-12-19 19:02:17 +00:00
Riu Sakura 2b61231f82 add japanese translation 2022-12-19 15:33:31 +09:00
Wbjitscool 620cc97bad Upload files to 'mods/ITEMS/mcl_crimson/textures' 2022-12-19 04:22:59 +00:00
Michieal 64c8afc8f0 Undo the revert. 
>.< /facepalm *grumbles*
 2022-12-19 04:11:25 +00:00
Michieal f737df79e5 revert 7a3f373425 
revert Misc. Fixes.
Added in burn times for slabs.
And then amend the commit to remove an oops.
 2022-12-19 04:06:33 +00:00
Michieal 7a3f373425 Misc. Fixes. 
Added in burn times for slabs.
And then amend the commit to remove an oops.
 2022-12-18 22:41:33 -05:00
Michieal 63ea851e63 Merge remote-tracking branch 'origin/mcl_bamboo_new' into mcl_bamboo_new 
# Conflicts:
#	mods/ITEMS/mcl_bamboo/init.lua
 2022-12-18 22:35:57 -05:00
Michieal fe26f117da Misc. Fixes. 
Added in burn times for slabs.
And then amend the commit to remove an oops.
 2022-12-18 22:28:50 -05:00
Michieal 5191326fc7 Misc. Fixes. 
Added in burn times for slabs.
 2022-12-18 21:04:43 -05:00
Wbjitscool 4b8493f1a4 update 'mods/ITEMS/mcl_crimson/init.lua' 
fixed some accidental changes that were not meant to happen sorry
 2022-12-19 01:04:59 +00:00
Wbjitscool b3a8ba57e7 update 'mods/items/mcl_crimson/init.lua' 
some new changes
 2022-12-19 00:43:32 +00:00
ancientmarinerdev 20ca34233c Merge pull request 'Respawn Anchor Cleanup & Fixes' (#3129) from FossFanatic/MineClone2:more_respawn_anchor_changes into master 
Reviewed-on: MineClone2/MineClone2#3129
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2022-12-18 23:17:53 +00:00
Michieal 1861d7d30d Conversation Fix. (Removed extra IF statement.) 2022-12-17 01:23:48 +00:00
Wbjitscool 49fb36bac2 Upload files to 'mods/ITEMS/mcl_crimson/textures' 
the png files for thoes changes
 2022-12-16 05:27:23 +00:00
Michieal c09ed02801 A more elegant solution for slabs 
After a good bit of trial and error, and asking questions... I have rewritten the override code and it works. (tested, slabs can now be used to make composters and barrels with this method.)
 2022-12-16 05:24:54 +00:00
Michieal da4e359df0 Merge branch 'master' into mcl_bamboo_new 2022-12-16 04:09:56 +00:00
Michieal 4da20f5e73 Main - Fixed Bamboo Sign Errors. 
Fixed Stripped Bamboo Block Description.
Added in Bamboo Plank Recipe that uses Stripped Bamboo Blocks.
Removed double translation of "Bamboo Sign" in sign registration. (Caused the Bamboo Sign Errors.)
Added bamboo plank slabs to the group "wood_slabs" so that the barrel recipe works oob.
 2022-12-15 22:35:10 -05:00
kabou 4e282df905 Mangrove roots are not leaves and some trivia. 
* Remove `leaves` group from mangrove roots node registration.  Mangrove
  roots should not decay like leaves do.
* Fix some formatting weirdness.
* Add a "fixme" comment to some duplicated code that causes luacheck to
  complain.
 2022-12-15 22:42:09 +00:00
kabou 1b0b2b8b04 Add `compostability` group to mangrove leaves. 2022-12-15 22:42:09 +00:00
kabou c33d7d0106 Remove duplicate callback registration. 
* `on_place` was registered twice in mangrove tree trunk node
  registration.  Remove one.
 2022-12-15 22:42:08 +00:00
kabou cec5b1668a Remove unused `leafdecay` group. 
* This group is no longer used and is removed from leaves node groups.
* Since it was never added to GROUPS.md, nothing needs changed there.
* Remove the `leafdecay_distance` parameter from node registrations.
 2022-12-15 22:42:08 +00:00
kabou adcf03e0c6 Refactor leaf decay ABM. 
* The leaf decay ABM no longer scans all leaves nodes.  Now only
  "orphaned" leaves are decayed.  These nodes are placed by callbacks
  in tree trunk nodes upon their destruction.
* This commit also removes the tree trunk node caching system and an
  abm throttling mechanism and its associated globalstep function.
 2022-12-15 22:42:08 +00:00
kabou a4ef367708 Add "orphaned" leaves nodes. 
* Add "orphaned" leaves nodes, these are copies of the regular leaves
  nodes whose sole purpose is to replace leaves nodes when no more tree
  trunks are present nearby.  The orphaned nodes are swapped in by a
  callback on destruction of tree trunk nodes and will be decayed by a
  dedicated abm that processes all nodes in `group:leaves_orphan`.
* Add `mcl_core.update_leaves()` function, a `after_destruct` callback
  handler for tree trunk nodes.  The function finds leaves nodes nearby
  destroyed tree trunk nodes and swaps these for orphaned leaves nodes
  if no other tree trunk nodes remain near them.
* Add `after_destruct` callbacks to tree trunk node registrations in
  mcl_core/nodes_trees.lua and mcl_mangrove/init.lua to update orphaned
  leaves.
* Add entry for group `leaves_orphan` to GROUPS.md
* Also add entry for group `leaves` to GROUPS.md (it was missing).
 2022-12-15 22:42:08 +00:00
Michieal 773c760727 Added Bamboo Mosaic. 
Added Tiki Lamp (extras) - Requires mcl_lanterns to be fixed to allow API to be called from other mods.
Moved Side Scaffolding to bambootoo.lua
 2022-12-14 23:02:08 -05:00
FossFanatic 35967caf71 Change some things 2022-12-14 14:43:45 +00:00
Michieal 29bc74dde9 Code reformat. 2022-12-14 03:26:22 -05:00
Michieal ca1a46efa7 A complete re-upload of MineClone2/MineClone2#3120 
Doing this to just fix it.
 2022-12-13 23:32:54 -05:00
ancientmarinerdev 38e49a4b80 Merge pull request '`mcl_hoppers` fixes' (#2983) from mcl-hoppers-fixes into master 
Reviewed-on: MineClone2/MineClone2#2983
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2022-12-11 20:55:59 +00:00
ancientmarinerdev ab3530c356 Merge pull request 'Nylium Block Fixes' (#3084) from FossFanatic/MineClone2:nylium_block_fixes into master 
Reviewed-on: MineClone2/MineClone2#3084
Reviewed-by: kabou <kabou@noreply.git.minetest.land>
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2022-12-11 03:21:11 +00:00
ancientmarinerdev fbed60bd2d Merge pull request 'Bee Block Sounds' (#3085) from FossFanatic/MineClone2:bee_block_fixes into master 
Reviewed-on: MineClone2/MineClone2#3085
Reviewed-by: kabou <kabou@noreply.git.minetest.land>
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2022-12-11 02:55:22 +00:00
AFCMS 7a371dc846
Format file again 2022-12-10 22:38:08 +01:00
AFCMS 7deec7ae03
Refactor hopper -> composter ABMs 2022-12-10 22:38:08 +01:00
AFCMS 47eda5b69e
Only register hopper -> composter ABMs if composter mod is enabled 2022-12-10 22:38:07 +01:00
AFCMS 8d921c0671
Add some type annotations 2022-12-10 22:38:07 +01:00
AFCMS 804aa388b5
Some manual formatting 2022-12-10 22:38:07 +01:00
AFCMS fcf9c35324
Use new vectors everywhere 2022-12-10 22:38:06 +01:00
AFCMS 9cc63ed716
Use `table.concat` for formspec generation 2022-12-10 22:38:06 +01:00
AFCMS c49f000894
Fix formating 2022-12-10 22:38:06 +01:00
FossFanatic adead97905 Add seagrass item texture 2022-12-08 17:37:14 +00:00
FossFanatic ef33891b3f Add seagrass item texture 2022-12-08 17:36:28 +00:00
FossFanatic 1c5170d36f Add sounds to bee nests and beehives 2022-12-08 11:43:58 +00:00
FossFanatic cf3e65e34e Add sounds to honey and honeycomb blocks 2022-12-08 11:43:06 +00:00
FossFanatic 0593a63626 Fix nylium blocks 2022-12-08 11:09:30 +00:00
ancientmarinerdev 9d87dcf611
Fix right click on copper crash 2022-12-07 18:27:11 +01:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 7c87ed2d6c Add rightclick support to pplates 2022-12-05 14:25:11 -06:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 d8c16b1f31 Add 1 sec deactivation delay to pplates 2022-12-05 14:25:10 -06:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 ba292aeb5d Pressure plates check for entity contact 2022-12-05 14:25:10 -06:00
AFCMS 18cfb88ae5 Replace lighting rod nodebox by 3d model 2022-12-04 11:13:36 -06:00