Commit graph

282 commits

Author SHA1 Message Date
iPopstop
6b1e9f4014 Update ru_RU.lang (#1473)
* Update ru_RU.lang

Minor grammar fixes

* Update ru_RU.lang

* Update

Added: 
- alchemic_vial
- baseComponent.catalyst_length_1
- baseComponent.catalyst_power_1
- bloodmagic.extraInfo (tooltip)
- commands.bloodmagic.error.*
Fixed:
- bloodmagic.blood_shard
- baseComponent.sulfur
- bloodmagic.monster_soul.raw
- bloodmagic.path.woodtile
- bloodmagic.path.stonetile
- bloodmagic.path.wornstonetile
- bloodmagic.path.obsidiantile
Updated:
- bloodmagic.sanguineBook
2018-12-30 16:13:46 -08:00
Tobias Gremeyer
03d087595f Reverence of the Condor port (#1490)
* Ported Reverence of the Condor from 1.7.10.

* Ported Reverence of the Condor from 1.7.10.

* Removed my shame
2018-12-30 16:13:13 -08:00
Tobias Gremeyer
7435d49824 Refactored Cry of Eternal Soul for BM2. (#1488)
* Refactored Cry of Eternal Soul for BM2.

* Added entries for the english translation strings

* Ticket handling fix

* Using more comprehensive `addOffsetRunes` instead of `addRune`'s

* Update src/main/java/WayofTime/bloodmagic/ritual/types/RitualEternalSoul.java

Co-Authored-By: Iorce <angryAEon@icloud.com>

* Update src/main/java/WayofTime/bloodmagic/ritual/types/RitualEternalSoul.java

Co-Authored-By: Iorce <angryAEon@icloud.com>

* Cleanup round 1

* cleanup round 2
2018-12-30 16:11:54 -08:00
AEon - Tobias
7942465edc Well of Suffering item drop control (#1388)
* Added a new DamageSource for the Well of Suffering
Added an event handler for death through Well of Suffering
Added a config option to enable (true) or disable (false) Well of Suffering Mob drops.

* Moved the DamageSource creation to RitualManager
Renamed the new DamageSource to "RITUAL_DAMAGE"
DamageSource "RITUAL_DAMAGE" is now used by RitualForsakenSoul and RitualWellOfSuffering
Added death message string for "RITUAL_DAMAGE" for en_US and de_DE

* Cleanup, removed the ability to damage entities in creative mode (creative mode should be considered as having infinite health, the rituals only damage mobs anyways).

* Update GenericHandler.java
2018-08-26 12:55:23 -07:00
AEon - Tobias
4941d0b361 Language files en_US -> de_DE (FINISHED), minor language file edits (#1321)
* Fixed downgrade level inconsistency

* Squashed commit of the following:

commit 7263e6fbc2
Author: PiscesdanAT <40119554+PiscesdanAT@users.noreply.github.com>
Date:   Sat Jun 9 18:01:30 2018 +0200

    Update de_DE.lang (#1337)

    Someone mixed up dusk and dawn

Updated de_DE.lang
Added some missing stuff in en_US.lang

* Update en_US.lang

Fixed the typo I inserted with previous commit.

* bloodmagic/.../de_DE.lang

 * more fitting translations

bloodmagicguide/.../de_DE.lang

 * 1/3 finished

.. en_US.lang

Whitespaces

Signed-off-by: Iorce <tgremeyer@icloud.com>

* bloodmagic/.../de_DE.lang:
- improved translations - again

bloodmagicguide/.../en_US:
- mudpack -> modpack (someone doesn't like them, it seems)
- wares off -> wears off (Typo)

bloodmagicguide/.../de_DE:
- another batch of translations

Signed-off-by: Iorce <tgremeyer@icloud.com>

* bloodmagic/.../de_DE.lang:
- improved translations - again

bloodmagicguide/.../en_US:
- mudpack -> modpack (someone doesn't like them, it seems)
- wares off -> wears off (Typo)

bloodmagicguide/.../de_DE:
- another batch of translations
- finished the "Ritual Master"

Signed-off-by: Iorce <tgremeyer@icloud.com>

* bloodmagic/.../de_DE.lang:
- improved translations - a bit more literal for some while keeping variety (Suppression and Displacement can have the same translation)

bloodmagicguide/.../de_DE:
- translated architect entry texts / titles

* bloodmagicguide/.../en_US.lang:
consistency (was Sacrificial Knife, every occurrence of that item is now called "Sacrifical Dagger"

bloodmagicguide/.../de_DE.lang:
some more....

* bloodmagicguide/.../en_US.lang:
corrected required Blood Altar tier from "greater than" to "greater than or equal to"

bloodmagicguide/.../de_DE.lang:
some more....

* bloodmagicguide/.../en_US.lang:
added clarification for Incense Altar block range

bloodmagicguide/.../de_DE.lang:
changed "Wahrheitssiegel" to "Siegel der Weissagung"
changed "Weihrauchaltar" to "Räucheraltar"
some more....

* bloodmagicguide/.../en_US.lang:
clarification for Sigil of the Fast Miner entry ("and" -> "at")

bloodmagicguide/.../de_DE.lang:
some more....

* bloodmagicguide/.../de_DE.lang:
some more....

* Changed "Blutorb" to "Blutkugel" in translation. Might have missed some cases of severe german grammar.

bloodmagicguide/.../en_US.lang:
Removed a "my", if someone misses it, it myght be readded.

bloodmagicguide/.../de_DE.lang:
some more....

* long overdue: closes #1320 (the disorient thing that nobody cares about)
bloodmagicguide/.../en_US.lang:
  people are now less warry and more wary about sentient mimics.

bloodmagicguide/.../de_DE.lang:
  some more.... (just the mimic stuff, since I commit after every typo I fix :o )

* bloodmagicguide/.../de_DE.lang:
some more....

Completed "The Architect"

* bloodmagic/.../de_DE.lang:
Leere Tafel -> Leere Schiefertafel (material clarification, remaining names unchanged to keep the names short)
Rudimentäre Falle -> [...] Schlinge (item icon looks like the latter, word has multiple meanings)
Ansammlung Kristalle [...] -> Kirstallansammlung (easier on the tongue, better text flow)

bloodmagicguide/.../en_US.lang:
fixed mistake in textflow

bloodmagicguide/.../de_DE.lang:
some more....

* bloodmagic/.../de_DE.lang:
  clarification
  Haupt- -> Meister

bloodmagicguide/.../de_DE.lang:
  some more....

bloodmagicguide/.../en_US.lang:
  Updated entry to reflect the new mechanic for creating pure will types

* bloodmagic/.../de_DE.lang:
  Ansammlung -> Gruppe

bloodmagicguide/.../de_DE.lang:
finished!

bloodmagicguide/.../en_US.lang:
fixed ritual name

* Finalized de_DE.lang

Ätzend -> Korrosiv

Contains: -> Enthält:

* Finalized de_DE.lang

ätzend -> korrosiv

* Update de_DE.lang

* Update de_DE.lang

Drained -> Verbraucht
Item -> Gegenstand

* Update de_DE.lang

Knoten-Router -> Netzknoten-Router

* Update de_DE.lang

Changed the base names for demonic Will to "Willpower"

-> clarification for the user that the residue is actualy willpower and the quality of said will is a measure of the potential

-> not changing other occurrences or notions in the book as no sane person would repeat "willpower" at every occasion.

* Applied quick fixes to de_DE.lang

* Merge me!
reverted a whitespace change in gradle.properties (no idea where that came from) and moved the disorient thingy to another PR)

* Take No.2

at fixing whitespaces.

* TAKE NO.3

(HOPEFULLY FINAL TAKE)
2018-08-07 16:45:15 -07:00
Arcaratus
6c5bbed348 Quick Fixes (#1362)
* Add modid to command localizations to prevent conflicts

* Corrected localizations of other lang files

* Fixed the items not being drawn on the right Y-level for the Sigil of Holding HUD
2018-07-22 07:07:27 -07:00
Nicholas Ignoffo
42c69eb557 Rework of ritual registration
Moves to annotation based registration. Configs are handled for automatically
2018-06-28 21:56:25 -07:00
Nicholas Ignoffo
e3d65a9e3a Rework of HUD element system
Allows configuration because that's probably a good thing. The values in
the json config are percentages of the screen.
2018-06-28 20:37:53 -07:00
PiscesdanAT
7263e6fbc2 Update de_DE.lang (#1337)
Someone mixed up dusk and dawn
2018-06-09 09:01:30 -07:00
WayofTime
eb6b8a3aa5 Small bit of framework for Soul Breath items, plus testing with the "Scroll of Icarus". Crafting mechanic as well as refilling of its resource not implemented. 2018-04-28 21:56:57 -04:00
Nicholas Ignoffo
151c1dfd67 "way pls" - TehNut 2018 (#1279) 2018-04-24 17:08:08 -07:00
Nicholas Ignoffo
ddf07acf70 "way pls" - WayofTime 2018 2018-04-21 16:42:22 -07:00
WayofTime
60c8441115 Added the "Resonance of the Faceted Crystal" 2018-04-20 13:39:05 -04:00
WayofTime
467bcb4d52 Readded the ritual "Focus of the Ellipsoid": creates a hollow ellipsoid from blocks provided in the connecting chest.
Also added the guide page for the Shard of Laputa.
2018-03-30 19:42:11 -04:00
qianzha
c079da7969 Update zh_CN.lang (#1240)
* Update zh_CN.lang

* Update zh_CN.lang

* Update zh_TW.lang
2018-03-07 16:12:52 -08:00
WayofTime
e2f7772e82 Improved the Ellipsoid effect. 2018-03-04 09:29:19 -05:00
Nicholas Ignoffo
106532061d Alchemy Table now supports new recipe API 2018-02-19 15:41:18 -08:00
Nicholas Ignoffo
6ffe4b8f58 Fix localization for augmented capacity and self sacrifice runes 2018-02-17 15:36:50 -08:00
Nicholas Ignoffo
c03af41c88 Some subitem cleanup
Still lots left to do. This will help prepare for The Flattening.
2018-02-13 23:32:15 -08:00
Nicholas Ignoffo
03fece58fa Rewrite Hwyla integration
Now properly makes use of the API
2018-02-08 19:01:12 -08:00
Nicholas Ignoffo
59f171ca5b Forgot lang 2018-02-06 19:00:15 -08:00
Nicholas Ignoffo
37ec0582eb Fixed the last of the model errors 2017-08-16 16:39:57 -07:00
Nicholas Ignoffo
3b173ecf17 Some models work, some don't 2017-08-15 23:01:37 -07:00
NoX-programer
e95b6f3bf2 Update ru_RU.lang: fix many typos (branch 1.11) (#1148)
* Update ru_RU.lang

* Update ru_RU.lang
2017-05-24 06:00:48 -07:00
Urey. Xue
22e3d4d62c Update zh_CN.lang (#1052)
* Simp. Chinese translation for SANGVINE SCIENTIEM, round I

* Simp. Chinese translation for SANGVINE SCIENTIEM, round I

Also contains update for main language file

* Amendment I

* Amendment II

* use "/cut" to trick String.split(), so that we could manually split page
* Minor improvements on translation

* Amendment III

* Amendment IV

* Amendment V

* Amendment VI

(cherry picked from commit ad46745)
2017-03-28 19:35:31 -07:00
neconeco2
b1670cdbd5 Update ja_JP.lang (#1076)
(cherry picked from commit 22354ea)
2017-03-02 20:37:32 -08:00
Nicholas Ignoffo
f3d980ee89 Rewrite Hymn of Syphoning for caps
Needs testing and needs to be optimized.

(cherry picked from commit 3f24e46)
2017-03-02 17:01:23 -08:00
Nicholas Ignoffo
93d7efcb40 Fix crash when creating a tank stack with meta > 15 (#1057)
Also finally fixes the tanks so they properly drop themselves.
2017-02-20 13:47:36 -08:00
Nicholas Ignoffo
72c321acb0 Implement an inverted MRS that requires an RS signal to function (#1022)
(cherry picked from commit ddb7542)
2017-02-19 14:41:06 -08:00
Nicholas Ignoffo
8259676d1b Downgrade tomes are now know that they're downgrades
Also Disoriented is localized finally

(cherry picked from commit e092161)
2017-02-19 14:33:56 -08:00
neconeco2
61bf9c1b08 Update ja_JP.lang (MC1.11) (#1050) 2017-02-13 12:12:45 -08:00
tartaric_acid
852d32f233 Update zh_CN file (#1003)
* Update zh_CN file

* Fix some mistakes (WIP)

* Finish all fix

* Fix some mistakes

(cherry picked from commit ae2ff03)
2017-01-02 01:35:48 -08:00
WayofTime
65104db564 Added Fluid routing to the routing nodes - this is done by using the Fluid Filter and placing a fluid container as the filter.
(cherry picked from commit a5a17f6)
2017-01-02 01:34:33 -08:00
Nicholas Ignoffo
ed27873fbe It runs! 2017-01-02 00:10:28 -08:00
Arcaratus
aac2623440 Implement a functioning Blood Tank (#969)
Added a search bar to the Upgrade Tomes Creative Tab
Updated some Altar fluid code (remove deprecated stuff)
Moved Rendering classes into appropriate package
Fix the localization errors on the Demon Crystals
A few cleanups here and there
2016-12-11 17:28:47 -08:00
Sokratis Fotkatzikis
841eb2a1df Create bg_BG.lang (#765)
* Create bg_BG.lang

done until L23
--------------------

* Update bg_BG.lang

DONE #L43 - #L48 ; #L66 - #L92
~~~~~~~~~~~~~~~~~~~~~~~~
TODO #L25 - #L41 ; #l50- #L64

* More Translation

Still not doe *Will finish it tomorrow* (Ping me at discord if I forget :P)

* here you go
2016-11-16 14:40:11 -08:00
WayofTime
3956c9f7dd Setup the .json of the Demon Will to use the new aspected textures. 2016-11-11 17:29:05 -05:00
WayofTime
fb38c2e8b8 Snares can no longer hit the thrower of the snare within 20 ticks of throwing it (#745)
Added the "Diseased" upgrade, which vastly decreases healing potency.
2016-11-11 10:42:56 -05:00
WayofTime
33b799723c Made it so you can view the recipes for downgrades in JEI. 2016-11-10 10:39:19 -05:00
WayofTime
97907367a1 Made a ritual augment that makes the Ritual of Regeneration steal health from mobs to heal the player. Also tinkered with having the ritual give absorption hearts (at a slow rate) 2016-11-06 21:49:48 -05:00
WayofTime
0419800a86 Finished most of the Augments for the Ritual of the Shepherd. 2016-11-06 17:03:10 -05:00
WayofTime
da4de55c2e Finished the Augments for the Ritual of the Crusher. 2016-11-03 10:52:14 -04:00
WayofTime
655c2880dc Made the aspected Sentient Tools drop their corresponding Will type on killing enemies. #753 2016-11-02 12:16:24 -04:00
WayofTime
3feb19a22d - Finished the Augments for the Ritual of the Feathered Knife.
- Changed the Ritual of the Feathered Knife so it respects the Tough Palms Living Armour Upgrade.
- Fixed the Ritual of the Feathered Knife so that its health threshold is percent-based.
2016-10-30 17:45:40 -04:00
WayofTime
5743d9f475 Finished the Augments for the Serenade of the Nether. 2016-10-24 21:23:45 -04:00
WayofTime
6b27896859 Added more augmentations for the Lava Ritual. 2016-10-23 20:59:49 -04:00
WayofTime
731ba99fa3 Added the Destructive Will effect to the Ritual of the Green Grove. This ritual now is done~ 2016-10-23 18:57:24 -04:00
neconeco2
28f9c367b8 Update ja_JP.lang (#952) 2016-10-16 19:51:33 -07:00
WayofTime
ea43fbce7d Added the Sigil of Elasticity, the Sigil of the Claw, and the Sigil of Winter's Breath. 2016-10-14 20:51:21 -04:00
WayofTime
2e192ff29c Attempted to add a new schematic, but for some reason the generated schematic is non-functional. (Divination Sigil is in testing mode)
Added some more stuff to the Downgrade ritual.
2016-10-10 10:57:29 -04:00