Commit graph

51 commits

Author SHA1 Message Date
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
f16f525f05 fixed lang files for universal circuits 2025-04-27 17:11:41 +01:00
Pyritie
fc6993d32a lang merge 2025-04-26 17:21:09 +01:00
Pyritie
e289fe5375 merge 2025-04-26 17:19:38 +01:00
Pyritie
8a1c6fecf7 lang update 2025-04-26 17:19:04 +01:00
Redeix
3422fbf08a Merge remote-tracking branch 'origin/dev' into dev 2025-04-26 02:35:27 -05:00
Redeix
fba935817e - Added handcart recipe
- Allowed more blocks to be used as oven, forge, and bloomery insulation
- Fixed lang error with treated wood planks recipe
- Forgot to add fishing net functionality before
2025-04-26 02:35:02 -05:00
Redeix
29bf80dba4
Merge branch 'dev' into dev
Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-04-25 22:49:01 -05:00
Pyritie
f67ce2f06a langs 2025-04-25 22:53:10 +01:00
Pyritie
58fce401ff
Merge branch 'dev' into dev
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-04-25 17:04:25 +01:00
TomPlop
ba67357214
Universal circuits (#914)
* Adding Universal Circuits

* Fix for Universal Circuits recipes

* Adding Univercal Circuits to their respective files
2025-04-25 17:03:38 +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
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
590f8d590e updating langs 2025-04-21 15:45:47 +01:00
Pyritie
7babaf2dfa updated stone age quests 2025-04-20 14:45:23 +01:00
Pyritie
1e77335fed Updated early ore processing part 2 to align with actual recipes 2025-04-19 14:36:12 +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
Dmitry
d8fa521bc9
Merge pull request #739 from Nebby1999/main
Feature:  Papermaking Overhaul with Wood
2025-01-26 00:00:21 +07:00
Dmitry
a9a682bd3d
Merge pull request #760 from Nebby1999/feature/forging_guide_in_guidebook
Add a Forging Guide to the Field Guide
2025-01-25 23:43:17 +07:00
Nebby1999
194af34182 Patchouli Entry 2025-01-25 00:42:36 -03:00
Nebby_G
382fa8c4c5 Finished Implementation, added to Field Guide 2025-01-20 14:29:42 -03:00
Nebby_G
68b08cddc3 Merge upstream 2025-01-19 21:30:53 -03:00
Nebby_G
9f9a9f229a More Hardwood work 2025-01-19 21:30:03 -03:00
Pyritie
46afcdc56b
I forgor ruby
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-19 23:08:00 +00:00
Pyritie
9f5fd32957
darkened the texture colors
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-19 23:06:30 +00:00
Pyritie
c7361acb63
adding textures
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-19 01:46:28 +00:00
Pyritie
b73347161a
Added strings for bud blocks
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-19 01:46:24 +00:00
Pyritie
9da5756b22
adding models
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-19 01:44:47 +00:00
Pyritie
48308f28cb
adding blockstates files
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-19 01:43:44 +00:00
Nebby_G
6c36949dc1 Hardwood Materials, items made 2025-01-18 12:11:03 -03:00
Pyritie
538f6c8952
add model for artificial end portal frame
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-10 23:20:57 +00:00
Pyritie
368542fc64
Delete kubejs/assets/tfg/patchouli_books directory
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-07 13:15:34 +00:00
Pyritie
8448e9147e
Update names of entries
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-07 09:34:34 +00:00
Pyritie
193770c671
Update tfg_ores.json
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-07 09:33:32 +00:00
Pyritie
41f99f940c
initial commit of field guide changes
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-05 17:31:57 +00:00
Pyritie
97a60f1b25
Added missing english strings for some TFG items/fluids
Signed-off-by: Pyritie <pyritie@gmail.com>
2024-12-19 19:03:37 +00:00
Dmitry
2e425c7211 Chinese translation of some quests by https://discord.com/channels/400913133620822016/1167131539046400010/1221904668817494087 2024-06-03 22:24:12 +07:00
Dmitry
1b4a6305b8 fixes 2024-02-10 14:07:15 +07:00
Dmitry
64fb11a55f dead 2024-02-10 10:54:08 +07:00
Xikaro
3fe538e35d gui fix 2024-01-12 09:36:15 +05:00
Xikaro
2076053aeb main_menu 2024-01-12 08:35:30 +05:00
Xikaro
8332513790 fix size icon 2024-01-10 15:39:08 +05:00
Xikaro
9af2acbffc v3 gui 2024-01-10 15:07:45 +05:00
Xikaro
73610b4fa5 new gui 2024-01-08 09:21:22 +05:00
Xikaro
fd5582a59a рефактор gui 2024-01-06 12:13:05 +05:00
Xikaro
2d4d00c194 mod id 2 2024-01-04 17:06:53 +05:00
Dmitry
3171989312 Сортировка файлов ассетов 2024-01-01 12:22:29 +07:00
Dmitry
b7467ec354 обновлены квесты 2023-12-15 17:20:23 +07:00
Dmitry
09610eefcd init 2023-12-14 23:51:52 +07:00