Bram
/
MineClone2
1
0
Fork 0
Code Pull Requests Activity
11,144 Commits
85 Branches
80 Tags
173 MiB
Commit Graph

11144 Commits (d0e981e4db1e90e05ace49b1a37a5c887ffe2e1a)

Author SHA1 Message Date
Michieal 46ca650ea4 further optimize and reformat mcl_honey's init.lua 2023-02-04 16:31:18 -05:00
Michieal c4e4a8e4d2 Move Waxing function to MCL_Honey. Remove commented code. 2023-02-04 03:31:11 -05:00
Michieal 08610296fc Merge branch 'master' into fix_copper_blocks 2023-02-04 03:30:20 -05:00
ancientmarinerdev 7d46fa3362 Merge pull request 'texture-consolidation' (#3380) from texture-consolidation into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3380
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-02-04 03:23:13 +00:00
ancientmarinerdev 58a08ea697 Merge pull request 'fix incorrect digtypes and missing sounds for some nether blocks' (#3351) from SmokeyDope/MineClone2:master into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3351
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-02-04 00:27:48 +00:00
Michieal 50effaa807 Made Requested changes from Pull Request. 2023-02-03 14:09:16 -05:00
SmokeyDope 08df1fe02f Update overworld vine breaking logic with vector.offset 2023-02-03 00:50:25 +00:00
SmokeyDope bc4d9211cb Update nether vine breaking logic with vector.offset 2023-02-03 00:43:17 +00:00
SmokeyDope cf05771e30 remove unnecessary blank line 2023-02-02 23:12:09 +00:00
SmokeyDope 16a6dcb66c Completely remove selection box for warped fungus 
Recommended by Michael
 2023-02-02 22:45:06 +00:00
SmokeyDope 89eb458df7 Fix up indentation for warped and crimson wart block sounds part 2 2023-02-02 22:42:44 +00:00
SmokeyDope eae1ee7cee Fix indentation for shapeless type @ netherite ingot 2023-02-02 22:39:37 +00:00
SmokeyDope 27f5a94c6a Fix up indentation for warped and crimson wart block sounds 2023-02-02 22:36:33 +00:00
SmokeyDope b4719599b5 Fix up indentation 2023-02-02 22:30:15 +00:00
SmokeyDope 659f11bf6f Fixed up indentation and removed excess blank lines 2023-02-02 22:08:37 +00:00
SmokeyDope 88a7a8afab Removed handy, axey, swordy, from nether vines & removed useless comments 2023-02-02 21:37:23 +00:00
ancientmarinerdev cdc922d4ac Merge pull request 'Make fletcher buy sticks' (#3383) from mrminer/MineClone2-Fletcher-Fix:master into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3383
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-02-02 15:37:35 +00:00
ancientmarinerdev 060732cd66 Merge pull request 'Adjust amethyst bud growth' (#3374) from Amethyst_Bud_Growth into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3374
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-02-02 15:26:20 +00:00
Michieal ad43fbd237 Adjust amethyst bud growth speed. 2023-02-02 15:25:33 +00:00
Michieal 618313f0af Merge branch 'master' into fix_copper_blocks 2023-02-01 23:51:29 -05:00
ancientmarinerdev 31fb7faf16 Merge pull request 'feat: Rain particles move straight down, increase acceleration slightly' (#3369) from atomdmac/MineClone2:adjust-rain-velocity into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3369
Reviewed-by: FossFanatic <fossfanatic@noreply.git.minetest.land>
Reviewed-by: epCode <epcode@noreply.git.minetest.land>
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-02-02 04:50:00 +00:00
Michieal a3bc3fd9b9 Removed old commented code to prevent accidental re-enabling, and put the todo into the correct spot. 2023-02-01 23:49:04 -05:00
Michieal c370f1884b Fixed the unwax copper blocks variants to be able to properly remove oxidization levels properly. 
MCL_COPPER Blocks off all types (not stairs and slabs) now function properly.
 2023-02-01 23:34:02 -05:00
Michieal b771f314fe Removed "scraping_copper_block" function. 
Fixed the wax copper blocks variants to have the wax removed.
 2023-02-01 23:24:59 -05:00
ancientmarinerdev f6a5004eab Merge pull request 'Fix wither crash on certain version of Lua.' (#3365) from fix_wither_head_crash into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3365
Reviewed-by: Nicu <kneekoo@noreply.git.minetest.land>
 2023-02-02 02:23:27 +00:00
ancientmarinerdev 7daa79a3f8 Fix wither crash on certain version of Lua. 2023-02-02 02:22:21 +00:00
Michieal 4b0b3217e2 added in TODO 2023-02-01 19:55:23 -05:00
ancientmarinerdev e363435134 Merge pull request 'mcl_starting_chest' (#3373) from mcl_starting_chest into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3373
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-02-01 23:54:44 +00:00
Michieal 5b1c7f2d3a Everything *BUT* scraping works properly. 2023-02-01 18:39:13 -05:00
ancientmarinerdev 63ace64cae Merge pull request 'Underwater Darkness HUD Removal' (#3367) from water_darkness_hud_removal into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3367
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-02-01 22:52:08 +00:00
FossFanatic 0c0845c1bd Change the underwater detection code a bit 2023-02-01 22:50:50 +00:00
FossFanatic 24b1078b61 Make the post effect alpha the same between water source and flow 2023-02-01 22:50:50 +00:00
FossFanatic 3546d04aaa Remove water HUD code 2023-02-01 22:50:50 +00:00
FossFanatic 1abd226e07 Remove water HUD 2023-02-01 22:50:50 +00:00
ancientmarinerdev f4b1116e21 Merge pull request 'Fix V6 & Singlenode Crash' (#3386) from v6_crash_fix into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3386
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-02-01 22:37:02 +00:00
FossFanatic cbb3260471 Make the palette fix LBM not run on v6 & singlenode 
This fixes a crash when loading a world that doesn't have any biomes and the LBM tries to give the grassy nodes a biome colour.
 2023-02-01 22:35:13 +00:00
ancientmarinerdev 855659a2a1 Merge pull request 'Fix ender chest crash + remove map hand reference' (#3387) from ender_chest into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3387
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-02-01 22:09:26 +00:00
Johannes Fritz 8793ed211e Fix ender chest crash + remove map hand reference 2023-02-01 09:56:12 -06:00
mrminer 01f814267e Update 'mods/ENTITIES/mobs_mc/villager.lua' 2023-01-31 21:14:23 +00:00
mrminer 8f4c69084d Make fletcher buy sticks 2023-01-31 21:12:01 +00:00
Michieal 425cf53194 fix minor bug. 2023-01-30 23:57:50 -05:00
Michieal d04f162d8f Initialize Global variable. 2023-01-30 23:53:40 -05:00
Michieal 7f84922403 fix missing skin file 2023-01-30 23:14:44 -05:00
Michieal 025f97187a Adjust for mcl_skins requirements. 2023-01-30 23:07:23 -05:00
Michieal 06effcd786 Merge branch 'master' into texture-consolidation 2023-01-30 22:57:38 -05:00
Michieal 6265148727 Move textures all into one centralized directory. 2023-01-30 22:55:53 -05:00
ancientmarinerdev 2ad60b06ea Merge pull request 'Set freeze and warning when mobs too close to boundary of world' (#3363) from fix_mob_past_mapgen_limits into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3363
Reviewed-by: Michieal <michieal@noreply.git.minetest.land>
 2023-01-31 02:29:02 +00:00
ancientmarinerdev 245ce99223 Using mcl_vars 2023-01-31 02:28:04 +00:00
ancientmarinerdev 1f107ec0c7 Tidy 2023-01-31 02:28:04 +00:00
ancientmarinerdev c209537cfe Make it a bit less chatty for logging 2023-01-31 02:28:04 +00:00