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

11915 Commits (f444efbb039a97ef1d0e9c20d15f2396a63fac0a)

Author SHA1 Message Date
the-real-herowl f444efbb03 Merge pull request 'Make cactus be able to damage mobs' (#4149) from Eliy21/MineClone2:cactus_mob_damage into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4149
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
 2024-01-25 01:57:22 +00:00
chmodsayshello a2a38b7b3d Merge pull request 'Fixed a crash' (#4154) from fix_capes_crash into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4154
Reviewed-by: chmodsayshello <chmodsayshello@hotmail.com>
 2024-01-22 20:20:31 +00:00
Eliy21 aa4f8ba6cc Add medium size mob distinction in the cactus mob damage area reach code 2024-01-21 09:18:43 +00:00
Eliy21 b645a2ab67 Remove commented out cactus mob damage code 2024-01-21 09:18:43 +00:00
Eliy21 d41d29be58 Add distinction between regular sized mobs and large mobs in the cactus mob damage area reach 2024-01-21 09:18:43 +00:00
Eliy21 434bb33f72 Add mob cactus damage logic to /mcl_mobs/physics.lua 2024-01-21 09:18:43 +00:00
Eliy21 d37840e022 Comment out cactus mob damage logic in preperation to move code logic to /mcl_mobs/physics.lua 2024-01-21 09:18:43 +00:00
Eliy21 aea5c6f7be Make cactus be able to damage mobs 2024-01-21 09:18:43 +00:00
SmokeyDope 2d2b64006b add nether vine placement checks for top and bottom of nodes (#4129) 
This adds placement checks to weeping and twisting vines, weeping vines should only be placed on bottom of nodes and twisting vines should only be placed on top of nodes.

Most of the work for this was done by JoseDouglas26. This was made with their permission, I just had to tweak the code a bit to get twisting vines to place right. Thank you Jose!

Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4129
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Co-authored-by: SmokeyDope <smokey@tilde.team>
Co-committed-by: SmokeyDope <smokey@tilde.team>
 2024-01-21 06:28:41 +00:00
emptyshore 8e103cf615 Mobs should not anger towards the player if damage is disabled. (#4114) 
Co-authored-by: Mateusz Uzdowski <mateusz@silverstripe.com>
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4114
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Co-authored-by: emptyshore <emptyshore@noreply.git.minetest.land>
Co-committed-by: emptyshore <emptyshore@noreply.git.minetest.land>
 2024-01-21 05:37:54 +00:00
the-real-herowl d1ac98a019 Fixed a crash 
Crash when the cape field is not set.
It is not set when joining an old world with the capes PR applied.
Also trimmed trailing.
 2024-01-21 03:09:11 +00:00
codiac d3c591915f Fix light check and limit Y level for slime chunk spawn. (#4139) 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4139
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Co-authored-by: codiac <codiac@inbox.lv>
Co-committed-by: codiac <codiac@inbox.lv>
 2024-01-21 02:52:36 +00:00
the-real-herowl b507838e13 Merge pull request 'Overhaul Texture_Converter.py and Conversion_Table.csv' (#4133) from Impulse/MineClone2:texture-conversion-120 into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4133
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
 2024-01-21 02:25:22 +00:00
Doods b944a70059 added piglin (did I fix git?) 2024-01-21 02:19:29 +00:00
Doods 9397e736a8 just a hotfix, doesn't count (true finish (at least for the conversion table.csv) 2024-01-21 02:19:29 +00:00
Doods b7ea609422 last minute changes 4 (hopefully final) 2024-01-21 02:19:29 +00:00
Doods 23a3d53ca6 last minute change 3 2024-01-21 02:19:29 +00:00
Doods 7e31f015fe Last minute changes #2 2024-01-21 02:19:29 +00:00
Doods f1fda9b412 last minute changes 2024-01-21 02:19:29 +00:00
James David Clarke 1a2b9e5930 More fixes 2024-01-21 02:19:29 +00:00
Doods bb29dade32 Added: trapdoors (partial), berrels, blackstone, basalt, beehive, bee nest, bell item, soul soil, light items (0 to 15), honey(comb) and things I forgot 2024-01-21 02:19:29 +00:00
James David Clarke 961ee13ba1 Converted utils os.system commands to useing the more pythonic: wand, library. And partially converted armor os.system commands to wand too. 2024-01-21 02:19:29 +00:00
James David Clarke efd19bd0ee Added requirements.txt 2024-01-21 02:19:29 +00:00
James David Clarke fe8612d944 Made terms clearer in gui.py 2024-01-21 02:19:29 +00:00
James David Clarke c586e480ed Fixed crash bug with GUI 2024-01-21 02:19:29 +00:00
James David Clarke 0da8428eef Made minetest directory handling, platform indiependent 2024-01-21 02:19:29 +00:00
James David Clarke ddfbd331c9 Refactor convert_textures code, seperated special cases into its own module 2024-01-21 02:19:29 +00:00
James David Clarke 47b6bd5539 GUI Now functional 2024-01-21 02:19:29 +00:00
James David Clarke 16cdc9fd12 Seperated common convert code from CLI and GUI so they can both use it 2024-01-21 02:19:29 +00:00
James David Clarke 2904e3119f Started on GUI and seperating code so GUI and CLI can share it 2024-01-21 02:19:29 +00:00
James David Clarke e04f4d3b2a Added --all flag. 2024-01-21 02:19:29 +00:00
James David Clarke 0584fc4ebf Fixed find_highest_minecraft_version, got rid of hardcoded major-minor version string. 2024-01-21 02:19:29 +00:00
James David Clarke 1147a9715a Added --default flag 2024-01-21 02:19:29 +00:00
James David Clarke e05e46bc59 Added Conversion Table validator. 2024-01-21 02:19:29 +00:00
Doods 7793a31f0e Added: stripped logs, planks, recovery compass, amethyst, netherite stuff 2024-01-21 02:19:29 +00:00
James David Clarke a6753806cc Refactored code: split up into different functions and modules. 2024-01-21 02:19:29 +00:00
Doods a25bdfbc90 added: loom, lodestone, tropical fish patterens, trim templates, fletching table (partial), craftguide seach icon, renamed armor stand item, renames dyes 2024-01-21 02:19:29 +00:00
James David Clarke 254fe4d98e Replace getopt code with argparse as its more modern. 2024-01-21 02:19:29 +00:00
James David Clarke 6324c805eb Added PIL dependency and added pixel dimentions autodetection 2024-01-21 02:19:29 +00:00
James David Clarke 3103969bdc Got rid of redundent "Target path" field as its always "./textures" 2024-01-21 02:19:29 +00:00
Doods 7cb17eefa1 testing to make sure I know how to use git + adding 10 textures 2024-01-21 02:19:29 +00:00
James David Clarke 4f0ad6de6d Extra tools 2024-01-21 02:19:29 +00:00
James David Clarke 59ffda6e86 Added my internal tools 2024-01-21 02:19:29 +00:00
James David Clarke 1b7cde697a Updated Grass,Fern,Vine,Lily Pad and leaves to MC 1.19+ 2024-01-21 02:19:29 +00:00
James David Clarke bae95fea09 Updated rails to MC1.19+ 2024-01-21 02:19:29 +00:00
James David Clarke 5f6173b999 Some fixes to the conversion script to make rails work in MC1.9+ Packs 2024-01-21 02:19:29 +00:00
James David Clarke bd113dd902 Added Missing textures to Conversion_Table.csv 2024-01-21 02:19:29 +00:00
James David Clarke 557ea75c5d Added more textures to Conversion_Table.csv 2024-01-21 02:19:29 +00:00
James David Clarke 98a5f07ef8 Added support for cherry blossoms MC 1.20+ 2024-01-21 02:19:29 +00:00
James David Clarke 29fe5e5b40 Added more entries and modified existing to Conversion_Table.csv 2024-01-21 02:19:29 +00:00