297 Commits

Author SHA1 Message Date
4ba49b23a3 Merge pull request 'Update 'README.md'' (#20) from anonfunc-patch-1 into master
Reviewed-on: https://git.harting.dev/TAIGA/TAIGA/pulls/20
2020-08-27 16:54:42 +02:00
5320a955b9 Update 'README.md' 2020-08-27 16:54:21 +02:00
5dd38a4324 Merge pull request 'Update 'README.md'' (#16) from idlegandalf-patch-1 into master 2020-05-22 15:52:24 +02:00
d936c57e27 Update 'README.md' 2020-05-22 15:52:12 +02:00
18dc97de61 Merge pull request 'Update 'LICENSE'' (#12) from license-change into master 2020-05-04 04:56:47 +02:00
bfec4bc442 Update 'LICENSE' 2020-05-04 04:56:30 +02:00
1e7ab1fc49 Merge pull request 'Spawn Nether/End ores in Overworld if allow-nether is set to FALSE on server' (#7) from Blaster/TAIGA-OV:master into master 2020-04-23 15:18:03 +02:00
Blaster
18543ec172 Formatting fix 2020-02-13 17:21:11 +01:00
Blaster
cda20df501 Formatting fix 2020-02-13 17:16:52 +01:00
Blaster
ada8e9e004 Upload files to 'src/main/java/com/sosnitzka/taiga/world'
Formatting fixes
2020-02-13 17:14:05 +01:00
Blaster
9828cc1a66 Delete 'WorldGen.java' 2020-02-13 17:12:46 +01:00
Blaster
4f852b0d32 src/main/java/com/sosnitzka/taiga/world/ 2020-02-13 17:09:13 +01:00
Blaster
c509b4cdd9 Upload files to 'src/main/java/com/sosnitzka/taiga/world'
Reupload
2020-02-01 23:58:59 +01:00
Blaster
fd80efa354 Upload files to 'src/main/java/com/sosnitzka/taiga/world'
Edited source as requested
2019-12-20 04:03:43 +01:00
Blaster
5ff045ecac Upload files to 'src/main/java/com/sosnitzka/taiga/world' 2019-12-11 20:07:32 +01:00
4c4268aa3d Update 'README.md' 2019-07-26 00:38:23 +02:00
abdc6da21d moved harvest level translation to client proxy 2018-10-10 15:56:22 +02:00
1ff00daf4b updated forge, tconstuct 2018-10-08 03:38:27 +02:00
804a02d3fd prevent TraitCatcher from picking up mobs killed without a weapon with the trait, fixes #177 2018-10-08 03:06:54 +02:00
adf19453c5 updated gradle wrapper 2018-10-08 02:27:26 +02:00
7e4c4baf05 fixed #174: added missing safety factor to division
Signed-off-by: Giovanni Harting <539@idlegandalf.com>
2018-08-26 00:26:43 +02:00
809c10ef51 Merge branch 'master' into 'master'
Add ja_JP.lang

See merge request TeamFRM/TAIGA!169
2018-06-30 13:05:33 +02:00
koh
058ec404a2 Add ja_JP.lang 2018-06-30 09:33:53 +02:00
2227b0017e made naming of Unstable/Instable trait consistent
added translating options for harvest levels

Signed-off-by: Giovanni Harting <539@idlegandalf.com>
2018-06-28 17:03:24 +02:00
05ebd28180 Update README.md 2018-06-17 14:16:33 +02:00
468a5e4aac Update README.md 2018-06-15 21:14:16 +02:00
e98fc61144 general code cleanup
removed some unused classes

Signed-off-by: Giovanni Harting <539@idlegandalf.com>
2018-06-12 18:12:36 +02:00
f4befa63c9 fixed some typos
Signed-off-by: Giovanni Harting <539@idlegandalf.com>
2018-06-12 10:34:55 +02:00
ddb56b6043 added modifier key to right click actions of traits, now requires default LCONTROL to be pressed. fixes #112
Signed-off-by: Giovanni Harting <539@idlegandalf.com>
2018-06-12 10:23:41 +02:00
d585d781f6 fixed book; added zh_TW lang thanks to CLOVERsquare 2018-06-11 07:59:49 +02:00
556d79156b fixed #157
removed some not used traits

Signed-off-by: Giovanni Harting <539@idlegandalf.com>
2018-06-11 07:35:45 +02:00
冷风
15e62a8530 Update zh_CN.lang (#159)
* Update zh_CN.lang

* Update abyssum.json

* Update aurorium.json

* Update jauxum.json

* Update karmesine.json

* Update obsidiorite.json

* Update ovium.json

* Update uru.json

* Update zh_CN.lang

* Update zh_CN.lang

* Update zh_CN.lang

* Update abyssum.json

* Update prometheum.json
2018-02-12 01:54:28 +01:00
5a111ba290 fixed #160: tooltips preventing server to start 2018-02-12 01:51:22 +01:00
冷风
b98cc5284c Update zh_CN.lang (#158)
Updated zh_CN language files (+ book)
2018-02-10 05:36:49 +01:00
9f1b4e066c added name & desc for trait crushing and leveled 2018-02-09 14:25:46 +01:00
25aee96d6d use correct oreDict prefix for dilithium, fixed #124 2018-02-08 19:57:12 +01:00
ee2fa56eca removed not used iron_nugget from oreDict, fixing #151 2018-02-08 19:50:52 +01:00
17ae55c359 1.12.2; not well tested; book integration still broken 2018-02-08 19:37:21 +01:00
1c07cfc5ee Revert "Started with rework of alloying process and balancing of levels of natural ores." 2017-09-23 15:22:50 +02:00
076a6d6f87 fixed #149, some more cleanup 2017-07-09 17:55:52 +02:00
Jason Spradlin
b063257977 Fixes #147 - Eezo ingot now converts to 9 nuggets (#148)
Conversion previously listed as Eezo Block = 9 Ingots, 1 Ingot = 9 *Ingots*.

Now listed as  Eezo Block = 9 Ingots, 1 Ingot = 9 *nuggets*
2017-07-08 22:22:19 +02:00
TechieJunk
5dca654237 Fix for Tiberium melting into Dilithium. (#145) 2017-07-08 22:22:10 +02:00
2e51738c45 first 1.11.1 attempt 2017-07-08 22:15:11 +02:00
Robert Sosnitzka
4b256caff9 Started with rework of alloying process and balancing of levels of natural ores. 2017-05-11 23:04:36 +02:00
Bill Parrott
b874a41abb fix divide by zero error (#121) 2017-02-02 16:06:23 +01:00
Robert Sosnitzka
719d326f7e Fixed something 2017-01-19 22:13:20 +01:00
8fbef49b10 separated overworld and others dimensions worldgen 2017-01-16 19:27:33 +01:00
c9f6d820b7 added void detection in worldgen 2017-01-16 19:13:21 +01:00
Robert Sosnitzka
d2cd916be7 Merge remote-tracking branch 'origin/master' 2017-01-15 23:38:07 +01:00
Robert Sosnitzka
26ab0139c0 Added missing icon, added Trait Mutate. 2017-01-15 23:37:38 +01:00