Mirrorlandia_minetest/MineClone2
1
0
Fork 0
mirror of https://git.minetest.land/MineClone2/MineClone2.git synced 2024-11-28 13:53:45 +01:00
Code Issues Packages Projects Releases Wiki Activity
9,964 Commits 109 Branches 83 Tags 165 MiB
2db9ea6459
Commit Graph

9964 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
FossFanatic
2db9ea6459 Merge pull request 'Small Useless Textures Cleanup' (#3164) from useless_textures_cleanup into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3164
Reviewed-by: kabou <kabou@noreply.git.minetest.land>
 2022-12-24 15:16:28 +00:00
FossFanatic
e0a9aca469 Merge branch 'master' into useless_textures_cleanup 2022-12-24 15:05:14 +00:00
FossFanatic
fb8f59e918 Merge pull request 'Overworld Biome Sky And Fog Colours' (#3158) from biome_skycolor_overworld into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3158
Reviewed-by: kabou <kabou@noreply.git.minetest.land>
 2022-12-24 15:01:43 +00:00
FossFanatic
9eb86f011b Make the code clearer to read 2022-12-24 14:54:48 +00:00
FossFanatic
770dd0ec47 Merge branch 'master' into useless_textures_cleanup 2022-12-24 12:31:56 +00:00
FossFanatic
00b2afecad Merge branch 'master' into biome_skycolor_overworld 2022-12-24 12:31:10 +00:00
ancientmarinerdev
cbf090485c Merge pull request 'Fix creative inventory view being reset upon taking damage' (#3102) from CyberMango/MineClone2:bug/mango/creative_inventory_view_resets_on_damage into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3102
Reviewed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2022-12-24 01:18:16 +00:00
CyberMango
bd38827f60 Fixes #2976 
Now the inventory view on creative is no longer set to the survival
inventory upon taking damage.
Also the initial inventory view when openning a world in creative is at
the search page, not the survival inventory page.

mcl_inventory/init.lua no longer wraps mcl_armor.update_player to also
update the inventory view. This visual update happens anyways since it
is registered to happen on a visual change with
mcl_player.register_on_visual_change .

This also fixes a small visual bug that, on creative mode, if you would
equip/unequip an armor piece, the image of the player would be updated
twice.
 2022-12-23 13:54:41 +02:00
FossFanatic
522bbbbe26 Delete 'mods/ENTITIES/mobs_mc/textures/mobs_mc_enderman_block.png' 2022-12-22 12:47:44 +00: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
FossFanatic
a50908e1eb Fix the flat biome having a beach sky colour 2022-12-21 16:00:04 +00:00
FossFanatic
afbb8e2288 Add locals for certain hex codes that occur too many times 2022-12-21 15:57:33 +00:00
FossFanatic
79b1db4b1a Fix underwater fog colour regression 2022-12-21 14:04:47 +00:00
FossFanatic
1c752019f0 Make the explanation shorter 2022-12-21 13:08:23 +00:00
FossFanatic
1977dbf9a1 Remove excessive whitespace 2022-12-21 13:05:52 +00:00
FossFanatic
91836f3a1d Add sky and fog colour for each overworld biome 2022-12-21 13:04:46 +00:00
FossFanatic
35b2f3b638 Make overworld biome specific (daytime) sky and fog colours possible 2022-12-21 13:01:54 +00:00
ancientmarinerdev
a6e0da0e07 Merge pull request 'Fixes https://git.minetest.land/MineClone2/MineClone2/pulls/3120 | Complete re-upload of the mcl_bamboo branch.' (#3123) from mcl_bamboo_new into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3123
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2022-12-21 00:47:21 +00:00
ancientmarinerdev
1c24adb714 Merge pull request 'Animated Nether Tree Textures' (#3155) from FossFanatic/MineClone2:animated_nether_trees_possible into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3155
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2022-12-20 21:19:45 +00:00
ancientmarinerdev
658a08181c Merge pull request 'Nether Ores And Blackstone Fixes' (#3154) from FossFanatic/MineClone2:nether_ores_and_blackstone_fixes into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3154
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2022-12-20 21:04:52 +00:00
Michieal
1a56a32fa8 misc. error fix 2022-12-19 16:16:54 -05:00
Michieal
0a4243a0f3 Merge remote-tracking branch 'origin/mcl_bamboo_new' into mcl_bamboo_new 
# Conflicts:
#	mods/ITEMS/mcl_bamboo/init.lua
 2022-12-19 16:00:05 -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
Michieal
e53d7576c3 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 13:44:24 -05:00
Michieal
64c8afc8f0 Undo the revert. 
>.< /facepalm *grumbles*
 2022-12-19 04:11:25 +00:00
Michieal
f737df79e5 revert 7a3f37342544f7f6b18da787834ee056c89f19ac 
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
ancientmarinerdev
45c85841e8 Merge pull request 'Add bookshelves and anvils as structure constructed nodes' (#3133) from structure_construct_nodes into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3133
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2022-12-19 01:14:39 +00:00
PrairieWind
0a2f57476e Update Woodland Outpost Schematic 
Switched double chest with barrels so that they work correctly
 2022-12-19 01:03:53 +00:00
PrairieWind
256655df83 Add bookshelves and anvils as structure constructed nodes 2022-12-19 01:03:53 +00:00
ancientmarinerdev
20ca34233c Merge pull request 'Respawn Anchor Cleanup & Fixes' (#3129) from FossFanatic/MineClone2:more_respawn_anchor_changes into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3129
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2022-12-18 23:17:53 +00:00
ancientmarinerdev
93814880d0 Merge pull request 'Make Night Sky Darker' (#3138) from FossFanatic/MineClone2:minecraft_like_night_sky into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3138
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2022-12-18 22:44:42 +00:00
Michieal
1861d7d30d Conversation Fix. (Removed extra IF statement.) 2022-12-17 01:23:48 +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
ancientmarinerdev
4ba3af5c73 Merge pull request 'Add .editorconfig file to enforce codestyle in compatible editors' (#3091) from editorconfig into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3091
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2022-12-15 22:59:08 +00:00