Commit graph

129 commits

Author SHA1 Message Date
Pyritie
263a9dfab7 merge 2025-06-05 12:24:32 +01:00
Pyritie
1f507feefa changed copper diving equipment durability to match copper armor, all diving equipment now copies any forging bonuses 2025-06-04 21:59:56 +01:00
Pyritie
a79652844d merge 2025-06-01 21:18:02 +01:00
TomPlop
6ad1717237
Fix for Hopper conflict with Assembler (#1098) 2025-05-30 19:58:37 +01:00
Redeix
2bf3746f33
- Changed the weird assembler piston recipe. (#1092)
* - Changed the weird assembler piston recipe.

* - Updated Changelog
2025-05-30 08:24:11 +01:00
Pyritie
1305d713f4 merge 2025-05-29 21:01:25 +01:00
Pyritie
d2cc83aeef fixes #1075 2025-05-27 21:08:19 +01:00
Pyritie
942b16cb35 put moss blacks back in the dirt tag so all the different ferns can be placed on them 2025-05-27 20:40:00 +01:00
Pyritie
ae4abcadec merge 2025-05-21 20:59:36 +01:00
Pyritie
6bf4a74479 removed the last few ways of getting perma lights pre-LV 2025-05-18 21:31:42 +01:00
Pyritie
9262133484 merge 2025-05-13 10:55:31 +01:00
Pyritie
3bad04a06b removed the leather armor recycling because it's basically infinite armor 2025-05-11 17:20:14 +01:00
Pyritie
ec576813c2 Merge branch 'dev' into feature/space 2025-05-08 22:15:15 +01:00
Pyritie
994d6e58d7 added clay block hand compression recipe 2025-05-07 22:21:23 +01:00
Pyritie
38219fdb98 Merge branch 'dev' into feature/space 2025-05-05 16:08:00 +01:00
Pyritie
744ea4824a coke and coal are no longer gems, and moss is no longer dirt 2025-05-03 22:47:06 +01:00
Pyritie
7c86ce53c0
Merging space stuff from my own fork into the main repo (#935)
* ignore .vs

* initial commit of ~space~

* fixed planets in config

* adding ore blocks to anorthite, renamed moon deepslate to dunite

* added moon ore veins, adjusted earth ones, added separate rock blocks

* added new buds for the new minerals, adjusted veins again

* forgot to add titanium to the moon!

* added moon zombies

* adjusted veins + added endermites

* first step to the moon

Signed-off-by: SverhRazum-Nah <leon.trol@mail.ru>

* change sky colors back to black

* added ad astra ores

* add desh veins to the moon

* added missing certus clusters

* adding desh veins/loc

* adding meteors + rabbit houses

* cheeeeeeese

* replaced meteor concrete with sky stone

* burying the meteors a little more

* initial commit of ores to field guide tool

* updated mineral data with new space ores

* fixed trapdoor orientation

* added anorthite rocks/bricks, changed names of cut deepslate, made cut deepslate + asurine visible

* changed average moon temp

* First Push

* split 'for' value into arrays, added russian

* pillars are stone, not metal

* adjusting spawns (again)

* oh so that's how charge and energy budget work

* added recipes for the create decoration blocks

* bricks and rocks

* remove ad astra recipes

* added limpets to the moon

* Landing on Mars

Signed-off-by: SverhRazum-Nah <leon.trol@mail.ru>

* Man thats a lot

* added translations for vein types, rock types, and added ukranium

* rabbit adjustments

* removed cooking anorthite cobble into raw

* Pushin P

* Parity

* Move translation tokens to the language tokens JSON

* Remove bin and obj

* Update .gitignore

* Update .gitignore

Signed-off-by: Pyritie <pyritie@gmail.com>

* moon mobs again

* Ore Index being Written

* More PRogress

* Improve string formatting

* toned down realgar

* structures! shulkers! oh my!

* Some progress on the vein index writing

* replace obsidian with scorchia in meteors

* meteor adjustments

* Actual vein index

* add globes to loot table

* Project Completed

* added solar power values

* adjusted ad astra recipes, hid some of the items, added bedrock ores

* more fiddling with structures

* made the rover a bit cheaper

* comply with review

* anorthite dust

* retextured shulkers

* disabled stuff from species/endermanoverhaul

* texture tweak

* recipe tweak

* fixed space rocks being invisible on the map for some reason

* removed earth bauxite vein

* mars rock

* mars stuff

* starting work on mars biome generation

* put biomes in folders

* climate stuff

* more mars worldgen

* added carve tag to space blocks

* move to correct folder

* removed veins

* added armalcolite to the moon

* anorthite -> anorthosite

* plagioclase -> syenite

* dunite -> basanite

* what is climate

* climates again

* mars rock layers

* fixed the temps!

* Update tags.js

Signed-off-by: Pyritie <pyritie@gmail.com>

* Add a Solution file

* adding this back

* remove tools folder since it was moved to a different repo

* some stuff that didn't merge

* updates

* merges

* merges

---------

Signed-off-by: SverhRazum-Nah <leon.trol@mail.ru>
Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: SverhRazum-Nah <leon.trol@mail.ru>
Co-authored-by: Nebby1999 <nebby131999@gmail.com>
2025-04-29 19:38:01 +01:00
Pyritie
70a9dfd920 Added recycling recipes for your old molds 2025-04-29 00:15:21 +01:00
Pyritie
b15a700cfe
Merge branch 'dev' into dev
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-04-26 15:34:35 +01:00
Pyritie
294c4ed59d slime now smelts into glue 2025-04-26 14:00:58 +01:00
Pyritie
04881b8fc2
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-04-25 13:11:55 +01:00
Redeix
ee55e713b1 - Added support for armor trims + new materials
- Added fishing nets
- Added more cloth alternatives
2025-04-25 01:38:06 -05:00
Pyritie
058a3ae103 added recipe for vanilla campfire, for people who like smoke particles (me) 2025-04-23 22:15:57 +01:00
Pyritie
ca7f66fa8f ice and sea ice can't be picked up with a saw any more, added a bunch of recipes around ice and snow for making packed ice in primitive age 2025-04-22 18:44:48 +01:00
Pyritie
b5eafc98ac added assembler recipes for the create deco bricks, fixed vanilla bricks only crafting a single at a time 2025-04-22 01:39:01 +01:00
Pyritie
f9db4f8c68 changed glowstone dust recipes to need glowstone block instead, so lamps are still relevant until you get to steam power. Also removed eternal candle 2025-04-21 21:55:31 +01:00
Pyritie
a2d1a9bff2 cleaned up more duplicate tfc/gt recipes 2025-04-21 15:27:38 +01:00
Pyritie
236402cc51 buffed the LV glowstone recipe 2025-04-19 13:43:31 +01:00
Pyritie
189f5aebce
Alpha Release: additions 0.9.0 (#880)
Signed-off-by: Pyritie <pyritie@gmail.com>
Signed-off-by: TomPlop <tomdidome@gmail.com>
Signed-off-by: Adora <adoradyne.58@gmail.com>
Signed-off-by: MetenBouldry <94766011+MetenBouldry@users.noreply.github.com>
Signed-off-by: CaitlynMC <135169224+CaitlynMC@users.noreply.github.com>
Signed-off-by: SverhRazum-Nah <leon.trol@mail.ru>
Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
Signed-off-by: Xikaro <55663835+Xikaro@users.noreply.github.com>
Co-authored-by: Xikaro <os.valerievich@ya.ru>
Co-authored-by: Nebby <78170922+Nebby1999@users.noreply.github.com>
Co-authored-by: Redeix <brayden.j.m.ford@gmail.com>
Co-authored-by: TomPlop <tomdidome@gmail.com>
Co-authored-by: aidie8 <aidenvanzuilen@gmail.com>
Co-authored-by: Xikaro <55663835+Xikaro@users.noreply.github.com>
Co-authored-by: Zleub <debray.arnaud@gmail.com>
Co-authored-by: Adora <adoradyne.58@gmail.com>
Co-authored-by: Curtis Merrill <curtis.r.merrill@gmail.com>
Co-authored-by: julia <97713533+juliakity@users.noreply.github.com>
Co-authored-by: GamerDadDave <gamerdaddave@gmail.com>
Co-authored-by: MetenBouldry <94766011+MetenBouldry@users.noreply.github.com>
Co-authored-by: CaitlynMC <135169224+CaitlynMC@users.noreply.github.com>
Co-authored-by: SverhRazum-Nah <leon.trol@mail.ru>
Co-authored-by: Redeix <59435925+Redeix@users.noreply.github.com>
Co-authored-by: Nebby1999 <nebby131999@gmail.com>
2025-04-18 14:49:56 +05:00
Pyritie
ec2e3cd3c4
Alpha Release: 0.9.0 (#849)
Signed-off-by: Pyritie <pyritie@gmail.com>
Signed-off-by: TomPlop <tomdidome@gmail.com>
Co-authored-by: Xikaro <os.valerievich@ya.ru>
Co-authored-by: Nebby <78170922+Nebby1999@users.noreply.github.com>
Co-authored-by: Redeix <brayden.j.m.ford@gmail.com>
Co-authored-by: TomPlop <tomdidome@gmail.com>
Co-authored-by: aidie8 <aidenvanzuilen@gmail.com>
Co-authored-by: Xikaro <55663835+Xikaro@users.noreply.github.com>
Co-authored-by: Zleub <debray.arnaud@gmail.com>
2025-04-15 23:27:17 +05:00
Deneth Weerasinghe
2064d07334
Assembler wool from string consistency
Signed-off-by: Deneth Weerasinghe <11477150+deneth-weerasinghe@users.noreply.github.com>
2025-01-20 22:02:28 +00:00
Dmitry
29fe3d4e66
Merge branch 'main' into trims
Signed-off-by: Dmitry <52341158+Exzept1on@users.noreply.github.com>
2025-01-18 00:28:09 +07:00
Dmitry
d319067a8e
Merge pull request #705 from Pyritie/patch-1
Added missing recipe for nether brick
2025-01-18 00:26:31 +07:00
Pyritie
66a1f2cc3b
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-13 14:04:01 +00:00
Pyritie
11b5790bd3
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-13 02:45:03 +00:00
Pyritie
1a29e4cfa0
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-13 01:17:21 +00:00
Pyritie
547e1dae9a
adjusted glowstone recipe
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-11 18:01:35 +00:00
Pyritie
644bcdee41
Adds early glowstone recipe
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-06 14:58:56 +00:00
Dmitry
f804da1613 recipes 2024-04-30 16:32:27 +07:00
Dmitry
7c38d12863 Port #322 - part 1 2024-04-28 14:02:01 +07:00
Dmitry
f49c2f65a7 tinted glass recipe 2024-04-25 18:30:14 +07:00
Dmitry
4aa55ceeae fixes 2024-04-24 23:41:45 +07:00
Dmitry
4bd0beb845 Fix #260 2024-03-16 12:41:52 +07:00
Dmitry
9e762069b0 Fix #272 2024-03-16 12:06:25 +07:00
Dmitry
780807fe25 Fix #252 2024-03-16 11:24:05 +07:00
Dmitry
f8badd4076 dead 2024-02-10 15:02:04 +07:00
Dmitry
b449f53bd6 some work 2024-02-10 13:35:31 +07:00
Dmitry
64fb11a55f dead 2024-02-10 10:54:08 +07:00
Dmitry
0501e1007f Много разного, в основном квесты 2024-02-06 18:09:13 +07:00
Dmitry
fa24fc62d7 dead 2024-02-04 18:50:42 +07:00