maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
5637 commits 1 branch 0 tags 80 MiB
Commit graph

766 commits

Author SHA1 Message Date
maciek
1dca64f916 fucking crowdin 2024-10-21 22:09:43 +02:00
modmuss50
0b4b28dd62 Fix reborn core display name. 2023-08-09 13:25:06 +01:00
modmuss50
f9017f2475 Cleanup model stuff and build script 2023-08-09 13:09:43 +01:00
modmuss50
c31a400725 Update publish plugin 2023-07-19 11:08:57 +01:00
modmuss50
e6fc735bea Move to custom curse forge publish plugin 2023-07-19 10:09:13 +01:00
modmuss50
e8bad0f009 Update loom + cleanup build.gradle 2023-06-27 23:02:00 +01:00
modmuss50
a108166075 Add task to help debug translation issues 2023-06-23 14:35:01 +01:00
modmuss50
814dc9ad30 1.20.1 2023-06-12 15:33:56 +01:00
modmuss50
a6a889475b Release for 1.20! 2023-06-07 16:23:31 +01:00
modmuss50
0171ef9778 Update REI support. 2023-05-31 19:21:36 +01:00
modmuss50
027be66230 TR ui work 2023-05-31 19:21:36 +01:00
modmuss50
503ed7ee49 Start on 1.20 2023-05-31 19:21:36 +01:00
modmuss50
b1eb120d0e Update REI 2023-03-18 12:47:29 +00:00
modmuss50
82978076d9 Set curseforge version 2023-03-14 19:32:01 +00:00
modmuss50
ab50a9fd95 1.19.4 stable 2023-03-14 19:31:41 +00:00
modmuss50
759c3fbfc3 1.19.4-pre1 2023-03-14 19:31:41 +00:00
modmuss50
acccaaa84c Update to loom 1.1 2023-02-01 21:09:48 +00:00
modmuss50
4c037bd80b Add some basic spotless formatting rules. 2022-12-18 12:10:22 +00:00
modmuss50
d0a2abefa5 Update Gradle + deps. Use spotless for license header checks. 2022-12-18 12:01:21 +00:00
modmuss50
573ba92920
1.19.3 port (#3074) 
* Start on 1.19.3 port

* Client runs, kinda

* Fix crash when opening item group

* Fix dynamic models

* Add atlas config for slot sprites

* Ore :)

* Rubber tree's, lakes and ore cleanup

* Add blocks to item group

* Fix rubber tree sapling

* added vanilla creative and missing peridot pickaxe (#3076)

* added vanilla creative and missing peridot pickaxe

* some small tweaks

Co-authored-by: ayutac <fly.high.android@gmail.com>

* added bamboo saw mill datagen recipes (#3077)

* added bamboo saw mill datagen recipes

* fixed datagen error

Co-authored-by: ayutac <fly.high.android@gmail.com>

* 1.19.3-rc1

* 1.19.3 port villager housing (#3082)

* added NBTs for the houses

* added the houses, theoretically

* added the houses, practically

* made house gen configurable

Co-authored-by: ayutac <fly.high.android@gmail.com>

* Fixes #3083

* reordered TR creative tab and small tweaks to the rest (#3081)

* reordered TR creative tab and small tweaks to the rest

* small bugfix

Co-authored-by: ayutac <fly.high.android@gmail.com>

* 1.19.3

* Bump version

Co-authored-by: Ayutac <skoch02@students.uni-mainz.de>
Co-authored-by: ayutac <fly.high.android@gmail.com>
 2022-12-07 16:28:29 +00:00
modmuss50
75c9fc9ba3 Update deps 2022-09-10 22:12:10 +01:00
modmuss50
34e3795bab Fix build 2022-08-08 23:21:23 +01:00
modmuss50
e401fa5a97 1.19.2 + gradle cleanup 2022-08-08 23:04:22 +01:00
shedaniel
554a63dbba
Remove usage of REI internals (#3019) 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2022-08-04 20:15:54 +01:00
modmuss50
3313f3165f 1.19.1 2022-07-27 18:30:16 +01:00
modmuss50
f3177b691a Revert buildscript changes, will bring back once 0.13 loom is ready. 2022-06-27 22:48:24 +01:00
modmuss50
2ee267f5ea Remove debug logging. 2022-06-24 00:23:59 +01:00
modmuss50
abcac85d0e Cleanup modcompat code, initial build setup for JEI support. 2022-06-24 00:12:30 +01:00
modmuss50
6347296509 1.19 2022-06-07 19:18:21 +01:00
modmuss50
0845d6618b Support id ingredients, and load conditions in datagen. 2022-06-01 22:34:53 +01:00
modmuss50
0ba85b37cc Update deps and mappings. 2022-05-21 19:00:33 +01:00
modmuss50
b0ddb4cc95 Update REI, disabled for now due to https://github.com/shedaniel/RoughlyEnoughItems/issues/856 2022-05-20 13:20:29 +01:00
modmuss50
c3622cb263 Split client and server. 2022-05-19 21:45:31 +01:00
modmuss50
3cb62b0291 1.19-pre1 2022-05-18 20:20:44 +01:00
Ayutac
3c0ad31cce
Uncrafting Overhaul (#2893) 
* Uncrafting Overhaul

Not yet working, some groovy curse I imagine.

new uncrafting recipes:
 - Chestplate (Dia/Ruby/Saph/Peri)
  + Ind.Grinder
   + Water
    -> 4 dusts + 2 small dust
   + Mercury
    -> 6 dusts + 1 small dust
 - Chestplate (Iron/Gold/Bronze/Silver/Steel)
  + Ind.BFurnace
   + Sand
    -> 5 ingots + dark ashes
 - Leggings (Dia/Ruby/Saph/Peri) or Horse Armor (Dia)
  + Ind.Grinder
   + Water
    -> 3 dusts + 2 small dust
   + Mercury
    -> 5 dusts + 1 small dust
 - Leggings (Iron/Gold/Bronze/Silver/Steel) or Horse Armor (Iron/Gold)
  + Ind.BFurnace
   + Sand
    -> 4 ingots + dark ashes
 - Helmet (Dia/Ruby/Saph/Peri)
  + Ind.Grinder
   + Water
    -> 2 dusts + 2 small dust
   + Mercury
    -> 4 dusts + 1 small dust
 - Helmet (Iron/Gold/Bronze/Silver/Steel)
  + Ind.BFurnace
   + Sand
    -> 3 ingots + dark ashes
 - Boots (Dia/Ruby/Saph/Peri)
  + Ind.Grinder
   + Water
    -> 1 dusts + 2 small dust
   + Mercury
    -> 3 dusts + 1 small dust
 - Boots (Iron/Gold/Bronze/Silver/Steel)
  + Ind.BFurnace
   + Sand
    -> 2 ingots + dark ashes
 - Axe or Pickaxe (Dia/Ruby/Saph/Peri)
  + Ind.Grinder
   + Water
    -> 3 small dust + 1 small saw dust
   + Mercury
    -> 1 dust + 3 small dust + 1 small saw dust
 - Axe or Pickaxe (Iron/Gold/Bronze)
  + Ind.BFurnace
   + Sand
    -> 1 ingot + dark ashes
 - Hoe or Sword (Dia/Ruby/Saph/Peri)
  + Ind.Grinder
   + Water
    -> 2 small dust + 1 small saw dust
   + Mercury
    -> 1 dust + 1 small dust + 1 small saw dust
 - Hoe or Sword (Iron/Gold/Bronze)
  + Ind.BFurnace
   + Sand
    -> 5 nuggets + dark ashes
 - Shovel (Dia/Ruby/Saph/Peri)
  + Ind.Grinder
   + Water
    -> 1 small dust + 1 small saw dust
   + Mercury
    -> 2 small dust + 1 small saw dust
 - Shovel (Iron/Gold/Bronze)
  + Ind.BFurnace
   + Sand
    -> 3 nuggets + dark ashes

I also made pickaxe and axe grindable for normal grinder, added a bit more sawdust for them in ind.Sawmill and added treetap to be grinded in industrial sawmill.

* Fix datagen

Co-authored-by: modmuss50 <modmuss50@gmail.com>
 2022-04-19 15:27:39 +01:00
modmuss50
9683023658 Revert "#2775 Adding Trinket support for BatpackItem. Thanks to SimonFlapse" 
This reverts commit e28c9176e5.
 2022-04-05 14:12:57 +01:00
Simon
e28c9176e5
#2775 Adding Trinket support for BatpackItem. Thanks to SimonFlapse 
* #2775 Adding trinket support for BatpackItem

* Added support for wearing BatpackItems in the 'back' trinket slot on the chest. This frees up an additional space for regular armor.

* BatpackItem only output when in chest armor slot
 2022-03-30 12:21:29 +03:00
modmuss50
85757e7854 Remove autoswitch api as the API broke, and I cannot find a working latest version on jitpack or cursemaven. I can bring this back once fixed, right now this is breaking the build. 2022-03-04 16:06:41 +00:00
modmuss50
14c237e4a4 Update curseforge version. 2022-03-02 02:41:20 +00:00
modmuss50
f7d5139332
Port to 1.18.2 (#2824) 
* Port to 1.18.2-pre1

* 1.18.2-pre3

* Fix build.

* Fixes and cleanup

* Build fix?

* Update REI
 2022-02-28 09:18:27 +00:00
Foo
43c0fa9e89
Fix spelling, grammar, javadocs, and similar issues (#2784) 
* fix naming in ModelSantaHat.java

* Fix grammar, spelling, and javadocs in RebornCore

* Fix spelling error in datagen

* fix missed variable name

* fix grammar, spelling, and javadoc errors

* fix grammar and spelling errors in project files

* specify indent_size in .editorconfig
 2022-02-06 13:14:56 +00:00
modmuss50
30dcd5dfa8 Depend on the reborn core version it was built against. 2022-02-03 11:35:39 +00:00
modmuss50
fa657d46e8 Fix recipe syncing, improve (add) error handling. 2022-01-27 20:34:26 +00:00
modmuss50
646132e908 Cleanup build script and hopefully fix datagen. 2022-01-20 18:39:34 +00:00
modmuss50
b59c535c3d Use fabric resource conditions api. Remove reborncore's. 2022-01-17 22:34:47 +00:00
modmuss50
892f3cba05 Fix curse mc version. Closes #2727 2022-01-08 00:42:13 +00:00
modmuss50
5fffac8ec1 beta 4 2021-12-07 13:01:27 +00:00
modmuss50
ce18aab73d Minor cleanup 2021-12-07 12:51:14 +00:00
modmuss50
b828e81116 Hopefully fix generated resources missing from the jar. 
Needs further work, but hopefully this will do for now.
 2021-12-07 12:50:24 +00:00
modmuss50
eb14061349 Fix incorrect jar name. 2021-12-06 11:56:07 +00:00