Mirrorlandia_minetest/MineClone2
1
0
Fork 0
mirror of https://git.minetest.land/MineClone2/MineClone2.git synced 2024-12-26 19:27:31 +01:00
Code Issues Packages Projects Releases Wiki Activity
10,293 Commits 114 Branches 83 Tags 170 MiB
5fd5cc9f1c
Commit Graph

10293 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
FossFanatic
5fd5cc9f1c Merge branch 'master' into simplified_palette_index 2023-01-17 12:53:09 +00:00
FossFanatic
c75ec6916c Conflict fix attempt 2 2023-01-17 12:52:50 +00:00
FossFanatic
4b6b4d8398 revert 26e032687a2173b87e4bf6f9702ea46757ac2da6 
revert Fix conflict with most recent master
 2023-01-17 12:49:43 +00:00
FossFanatic
26e032687a Fix conflict with most recent master 2023-01-17 12:39:15 +00:00
ancientmarinerdev
8adc1d48b2 Merge pull request 'Remove "mcl_farming:beetroot_item" from fortune drop, so Fortune only gives seeds.' (#3328) from beetroot_fortune_hotfix into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3328
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-01-17 00:59:25 +00:00
Michieal
ac30e25065 Remove "mcl_farming:beetroot_item" from fortune drop, so Fortune only gives seeds. 2023-01-16 19:40:07 -05:00
ancientmarinerdev
30d3b7ee23 Merge pull request 'mcl_bamboo Part 2.' (#3208) from mcl_bamboo_too into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3208
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-01-16 20:22:09 +00:00
Michieal
55bb9800f4 removed errant logging line. 2023-01-16 15:07:57 -05:00
Michieal
b805ae9926 Adjust bamboo growth rates to be close to the MC wiki. 2023-01-16 15:01:38 -05:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟
90c74f4a6a Merge pull request 'Fix undeclared global variable in mcl_buckets' (#3314) from buckets_warning into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3314
Reviewed-by: Michieal <michieal@noreply.git.minetest.land>
 2023-01-16 19:02:34 +00:00
Johannes Fritz
6e6c11cde2 Fix undeclared global variable in mcl_buckets 2023-01-16 12:56:59 -06:00
ancientmarinerdev
8feefcdd7b Merge pull request 'Give longer to breed mobs. 1.5s is not enough' (#3298) from extend_breeding_time into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3298
Reviewed-by: Michieal <michieal@noreply.git.minetest.land>
 2023-01-16 00:01:40 +00:00
ancientmarinerdev
9b28baaad6 Give longer to breed mobs. 1.5s is not enough 2023-01-16 00:00:28 +00:00
PrairieWind
60a1a364dc Merge pull request 'Fix animals jumping way too high upon growing up' (#3316) from growth_jump_fixes into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3316
Reviewed-by: Michieal <michieal@noreply.git.minetest.land>
 2023-01-15 23:43:07 +00:00
b3nderman
f9b021e4c6 Fix animals jumping way too high upon growing up 2023-01-15 22:47:05 +00:00
ancientmarinerdev
65fb911e5f Merge pull request 'Fix geode crash' (#3304) from fix_geode_crash into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3304
Reviewed-by: Michieal <michieal@noreply.git.minetest.land>
 2023-01-15 22:28:38 +00:00
ancientmarinerdev
38732e801d Fix geode crash 2023-01-15 22:27:02 +00:00
ancientmarinerdev
5ad2a990d4 Merge pull request 'Allow blaze spawners to be deactivated' (#3315) from fix_blaze_spawner_disable into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3315
Reviewed-by: Michieal <michieal@noreply.git.minetest.land>
 2023-01-15 22:24:59 +00:00
ancientmarinerdev
8f6c932e88 Allow blaze spawners to be deactivated 2023-01-15 22:22:14 +00:00
Michieal
e9c202ae45 Added Bamboo Biomes to spawning.lua. 2023-01-15 15:30:34 -05:00
Michieal
d6ee21d192 Merge branch 'master' into mcl_bamboo_too 2023-01-15 15:27:30 -05:00
PrairieWind
876fc2fb50 Merge pull request 'Fix tamed ocelot textures not being set correctly' (#3317) from tamed_cat_texture_fix into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3317
Reviewed-by: Michieal <michieal@noreply.git.minetest.land>
 2023-01-15 19:41:51 +00:00
Michieal
0c61035df0 Missing files from the optipng commit. (not exactly sure what happened.) 2023-01-15 14:30:12 -05:00
b3nderman
a7fac7c550 Fix tamed ocelot textures not being set correctly 2023-01-15 16:57:47 +00:00
ancientmarinerdev
93c9fdfaae Merge pull request 'Light Blocks' (#3078) from light-blocks into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3078
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-01-15 15:37:10 +00:00
AFCMS
3027965314 Add comment 2023-01-15 15:32:42 +00:00
AFCMS
e9c9f151de Let user dig light blocks when wielding a light block 2023-01-15 15:32:42 +00:00
AFCMS
fb8262bf57 Make light blocks buildable_to 2023-01-15 15:32:42 +00:00
AFCMS
726358da4b Rename callbacks parameters to match Minetest documentation 2023-01-15 15:32:42 +00:00
AFCMS
515204d296 Update translation template and add french translation 2023-01-15 15:32:42 +00:00
AFCMS
eb5f5678d6 Fix typo in barrier help text 2023-01-15 15:32:42 +00:00
AFCMS
33e2b79b2b Make nearby light blocks spawn particles when player wield one 2023-01-15 15:32:42 +00:00
AFCMS
7c497d9604 Remove config file 2023-01-15 15:32:42 +00:00
AFCMS
7c20896d5e Make light blocks not walkable 2023-01-15 15:32:42 +00:00
AFCMS
cd70dd5b88 Spawn particle then placing light blocks 2023-01-15 15:32:42 +00:00
AFCMS
302970d220 Basic light blocks 2023-01-15 15:32:42 +00:00
AFCMS
79876635af Use mcl_util.call_on_rightclick in on_place callback for barrier block 2023-01-15 15:32:42 +00:00
AFCMS
b9238b4069 Use new vectors 2023-01-15 15:32:42 +00:00
AFCMS
bf25fca47d Remove support for use_texture_alpha bool values (mt 5.3) 2023-01-15 15:32:42 +00:00
AFCMS
92261e5fb5 Remove stack_max fields duplicated with default value 2023-01-15 15:32:42 +00:00
AFCMS
1e31e383d4 Fix invalid function signature for on_place callbacks + handling of possible nil value 2023-01-15 15:32:42 +00:00
AFCMS
4457432d32 Format file 2023-01-15 15:32:42 +00:00
ancientmarinerdev
fa96f9d593 Merge pull request 'Music Hyphenation & Concision' (#3311) from music_hyphenation into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3311
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-01-14 22:00:15 +00:00
FossFanatic
60b19b31ab Add hyphenation 
This also adds hyphenation to `In-game`.
 2023-01-14 10:21:35 +00:00
FossFanatic
871c4f24c2 Change some language stuff 
This adds correct hyphenation and also makes things more concise.
 2023-01-14 10:20:30 +00:00
FossFanatic
18c0e1f050 Change the indexes back to the older ones 2023-01-14 10:05:00 +00:00
FossFanatic
fb8e41047d Use older palette PNG file 2023-01-14 10:00:42 +00:00
FossFanatic
2bd5e6a84f Delete text file 2023-01-14 10:00:19 +00:00
FossFanatic
23a13f14e0 Merge branch 'master' into simplified_palette_index 2023-01-14 09:51:47 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟
dd15092052 Merge pull request 'Give an option for players to disable the in game music' (#3299) from music_settings_switch into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3299
Reviewed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
 2023-01-13 21:31:20 +00:00