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

7860 Commits (6c804f44d55b7e2f4efc07949807ab26b51a61f6)

Author SHA1 Message Date
PrairieWind 66cd32b6ff Merge pull request 'Blast Furnaces and Smokers' (#2210) from PrairieAstronomer/MineClone2:furnaces into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2210
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-05-17 22:20:23 +00:00
PrairieWind d93704fa0e Merge branch 'master' into furnaces 2022-05-17 18:33:20 +00:00
PrairieAstronomer fe36d579eb Add Blast Furnace and Smoker to Villager Workstations 2022-05-17 10:37:55 -06:00
PrairieAstronomer 4af0a4daae Updated GROUPS.md and fixed blast furnace group name. 2022-05-17 10:34:44 -06:00
PrairieAstronomer fd18c0d213 Removed Unneeded Code from Blast Furnace, and updated description. 2022-05-17 10:27:41 -06:00
PrairieAstronomer 7ac2593164 Removed Unneed code and fixed description of Smoker 2022-05-17 10:03:15 -06:00
PrairieAstronomer 29e18015b8 Make Fish and Salmon Smokable 2022-05-17 09:48:51 -06:00
PrairieAstronomer e1a6baffe9 Smoker 2022-05-16 21:11:10 -06:00
PrairieAstronomer f1a80876de Make Copper Ore Blastable 2022-05-16 20:59:19 -06:00
PrairieAstronomer 3558541648 Blast Furnace 2022-05-16 20:45:45 -06:00
cora 3a9812a2d7 Merge pull request 'Add a command to safely remove all mob objects' (#2098) from add_clearmombs_command into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2098
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
 2022-05-15 20:07:41 +00:00
cora 5282a63bcb add options for nametagged mobs and range 2022-05-15 20:04:09 +00:00
cora e5de4bba65 keep nametagged mobs, add "all" argument 2022-05-15 20:04:09 +00:00
cora 628686ce79 Add a command to safely remove all mob objects 2022-05-15 20:04:09 +00:00
cora abe419caf9 Merge pull request 'MISC/mcl_commands: Improve /seed command (now it looks like in modern MC) and update RU locale' (#2208) from rudzik8/MineClone2:commands-improve into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2208
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-05-15 19:38:47 +00:00
rudzik8 37e72e333b Improve /seed command (now it looks like in modern MC) and update RU locale 2022-05-15 20:27:30 +07:00
cora e322a9e23a Merge pull request 'Implement piston fixes:' (#2207) from redstone_piston_fixes into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2207
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-05-15 10:30:11 +00:00
MysticTempest dd1a58b01e Implement piston fixes: 
This enables the feature of unsticky pistons. This allows
for some nodes to be unpullable, but otherwise pushable or diggable.
A certain selection of nodes that can never be moved.
And, stops certain entities from being pushed if they shouldn't move.

Along with this change; I've also updated the rules regarding
pushing, and pulling of nodes & objects to be more accurate to MC.
Now allowing for more complex redstone circuits to be built.
 2022-05-15 02:18:21 -05:00
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