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

8852 Commits (52c4a7dc284f59d1921bf7275a0a179296596281)

Author SHA1 Message Date
cora 87c9969801 Merge pull request 'Villager Workstations' (#2206) from PrairieAstronomer/MineClone2:villager_workstations_1 into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2206
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-05-14 22:21:47 +00:00
PrairieAstronomer fec5650711 Removed dependancies 2022-05-14 16:01:14 -06:00
PrairieAstronomer 5abfa555eb Added new workstations to villager jobsite definitions 2022-05-14 15:52:37 -06:00
PrairieAstronomer dead4069b0 Removed incorrect groups 2022-05-14 15:48:33 -06:00
PrairieAstronomer 4bc67a174b Loom 2022-05-14 15:34:08 -06:00
PrairieAstronomer c71b036e6a Cartography Table 2022-05-14 15:24:44 -06:00
PrairieAstronomer 046698c64f Fletching Table 2022-05-14 15:14:50 -06:00
cora e80eebd989 Merge pull request 'Update villager trades' (#2202) from villagers_update_2 into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2202
 2022-05-13 22:35:27 +00:00
cora 31b8ea26a2 add jobsites to professions table 2022-05-14 00:32:15 +02:00
cora fd6f2be485 update cleric trades 2022-05-14 00:32:15 +02:00
cora 07e0a90051 update tool smith trades 2022-05-14 00:32:15 +02:00
cora f073d4d420 update weapon smith trades 2022-05-14 00:32:15 +02:00
cora 89aaf6b709 update butcher trades 2022-05-14 00:32:15 +02:00
cora f09b578034 update leatherworker trades 2022-05-14 00:32:15 +02:00
cora 0ce1a92282 update armorer trades 2022-05-14 00:32:15 +02:00
cora 135ee97b21 update cartographer trades 2022-05-14 00:32:15 +02:00
cora 51cf92a909 update librarian trades 2022-05-14 00:32:15 +02:00
cora 2d47ad3e5f update fletcher trades 2022-05-14 00:32:15 +02:00
cora c28d700caf update fisherman trades 2022-05-14 00:32:15 +02:00
cora ba861d7b74 update farmer trades 2022-05-14 00:32:15 +02:00
cora 9b8b7ce6b4 refactor go home logic 2022-05-14 00:32:15 +02:00
cora 046b3a4ce2 Merge pull request 'enable simple mcl_mobs/mobs redo villager breeding' (#2204) from villager_breeding into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2204
 2022-05-13 22:31:15 +00:00
cora 354d17a14c enable simple villager breeding 2022-05-14 00:30:44 +02:00
cora 11265b60de Merge pull request 'Enable placing carpets on llamas and add textures for it' (#2201) from rudzik-llama-carpets into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2201
 2022-05-13 22:07:34 +00:00
rudzik8 7f3ba7d4a2 Enable placing carpets on llamas and add textures for it 2022-05-13 22:00:09 +00:00
cora 88e87bccff Merge pull request 'playerplus: fix deprecated add_player_velocity calls' (#2200) from fix-deprecated-add-vel into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2200
 2022-05-13 21:51:46 +00:00
cora a1209b14a1 playerplus: fix deprc. add_player_velocity calls 2022-05-12 23:30:39 +00:00
cora 729159f631 Merge pull request 'Refactor compass code.' (#2197) from get-compass-image-fix into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2197
Reviewed-by: cora <cora@noreply.git.minetest.land>
Reviewed-by: chmodsayshello <chmodsayshello@hotmail.com>
 2022-05-12 21:37:16 +00:00
kabou baf8e0b79c Update item entity for lodestone compass. 
* Added another special case to the item entity registration for
  lodestone compasses, without this a dropped lodestone compass would
  turn into a regular compass on being dropped.
* Update the compass and lodestone compass frame number to be the
  stereotype frame.
 2022-05-12 21:08:52 +02:00
chmodsayshello 00dba67cd8 remove lodestone compass from creative inventory 2022-05-12 19:06:13 +02:00
kabou 872b708465 Remove unused variable. 
* Removed unused variable `stack_max`.
 2022-05-11 21:45:15 +02:00
kabou 74e70b674e Fix return value of `get_compass_image()`. 
* `get_compass_image()` did not actually return the image number.
 2022-05-11 21:43:52 +02:00
kabou 14c882f982 Fix lodestone compass meta handling. 
* The nature of a compass was being determined by looking at its meta.
  This caused lodestone compasses with unset meta to turn into regular
  compasses.  Fixed by using string matching on the itemname.
* Changed lodestone rightclick handler to explicitly set the correct
  name and frame of the compass used on it instead of waiting for
  globalstep to do this.
 2022-05-11 21:31:50 +02:00
kabou 8ae605165b Fix lodestone compass stack_max. 
* Lodestone compasses are stackable.
* Remove hardcoded `stack_max` setting, use default.
 2022-05-11 17:53:41 +02:00
kabou aca4aca79b Add German translation. 
* Add "de" (German) translation by chmodsayshello.
 2022-05-11 17:43:57 +02:00
kabou bacc7613b5 Fix crash in mt 5.4 with vector ops. 
* `vector.from_string()` is not available in mt pre-5.5.  Replace with
  `minetest.string_to_pos()`.
 2022-05-11 17:41:10 +02:00
kabou 8a4b8707fa Add new compass API. 
* Add API.md
* Update mcl_itemframes to use the new API.
* Revert old exported function back to original API.
 2022-05-10 23:38:28 +02:00
kabou a8c231da34 Refactor compass code. 
* Split up `get_compass_image()` into smaller functions.  This allows
  for better code sharing between old and new API and globalstep fn.
* Add `get_compass_itemname()` function.  It will be the new API of
  choice, `get_compass_image() will be deprecated soon.
* Remove function declaration out of globalstep function.
* Various other performance improvements.
* Add local aliases for global functions
* Lodestone compasses can only stack 1 item.
* Document functions and variables.
* Fix lodetone compass inaccurately reusing compass descriptions.
* Add usage descriptions to node definitions
* Refactor craftitem registration code.
* Update translation templates.
 2022-05-10 22:43:03 +02:00
cora 4d342b8365 Merge pull request 'Village(r)s update' (#2189) from villager_spawning into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2189
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
 2022-05-09 22:01:25 +00:00
cora 12a943e222 Make villagers homeless when bed is gone on return 2022-05-09 10:29:58 +00:00
cora 8d0afede37 don't block mapgen on village generation 2022-05-09 10:29:57 +00:00
cora 0288581407 increase wait til village generated 2022-05-09 10:29:57 +00:00
cora 3774044f86 Walk back to bed instead of teleporting 2022-05-09 10:29:57 +00:00
cora 46dbf8c0ab Spawn villagers on villagegen, stay in village 
This spawns a villager per bed on village gen and saves the bed
position in the entity. If it moves too far from the village
it gets teleported (for now) back.
 2022-05-09 10:29:57 +00:00
cora 7c263c6a18 Merge pull request 'Potion Fixes:' (#2191) from Fix_waterbreathing_and_potion_icons into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2191
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-05-09 10:25:51 +00:00
MysticTempest 44b1d583a7 Potion Fixes: 
Ensure all potion icons disappear after their effect is gone.
Stop Breath bar from flashing when water_breathing is in effect.
 2022-05-09 05:18:59 -05:00
cora 1565999134 Merge pull request 'fix the 2nd nether dust warning' (#2190) from fix_weather_warning_2 into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2190
 2022-05-09 10:09:18 +00:00
cora 5a25e42fd3 fix the 2nd nether dust warning ^^ 2022-05-09 12:06:28 +02:00
cora 421995deb3 Merge pull request 'Fix list of spawnable biomes for rabbits.' (#2187) from rabbit_spawn_fix into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2187
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-05-08 20:01:56 +00:00
kabou 4e3a2a7b4c Fix list of spawnable biomes for rabbits. 
* Rabbits spawn in Desert biome.
* Rabbits do no spawn in Forest and Swamp biomes.
 2022-05-08 19:59:04 +00:00