Commit graph

549 commits

Author SHA1 Message Date
gamma-delta
4acfc707a7 bang on #253. this in no way fixes it and i'm halfway convinced it's a FD error 2022-09-22 09:18:19 -05:00
yrsegal@gmail.com
b8c3331592 fix a concerning exploit with dividing by zero 2022-09-18 11:47:56 -04:00
ChuijkYahus
2398d7e3f1
Update zh_cn.json 2022-08-30 12:09:43 +08:00
ChuijkYahus
aca1fa905a
Update zh_cn.json 2022-08-30 11:46:20 +08:00
ChuijkYahus
42ae3df0ba
Update zh_cn.json 2022-08-30 11:44:17 +08:00
yrsegal@gmail.com
9aa3019571 fix gradle again...
by specifying jar it should still be faster in general, but...
2022-08-29 12:20:12 -04:00
ChuijkYahus
efc506b79c
Update zh_cn.json
Updated to match en_us in main branch
2022-08-29 22:50:22 +08:00
ChuijkYahus
2d71b73b33
Merge branch 'gamma-delta:main' into main 2022-08-29 22:13:05 +08:00
ChuijkYahus
497f1df23d
Delete vectors.json 2022-08-29 22:11:39 +08:00
ChuijkYahus
104f80c9eb
Update zh_cn.json 2022-08-29 22:09:09 +08:00
ChuijkYahus
76b4121118
Update zh_cn.json 2022-08-29 15:33:44 +08:00
ChuijkYahus
4544d5f479
Update zh_cn.json 2022-08-29 15:25:20 +08:00
petrak@
d327d4d943
Merge branch 'main' into fix173+175 2022-08-28 22:11:54 -05:00
yrsegal@gmail.com
a7c827b662 AAAARGH 2022-08-28 23:09:25 -04:00
yrsegal@gmail.com
c914f34942 fix gradle being painfully slow, but again 2022-08-28 22:48:25 -04:00
gamma-delta
a092047e33 Clean up some advancements.
- Root now accepts any of the 3 denominations of amethyst
- Changed some wordings to hint at how to achieve enlightenment in the
  advancmenets
- Remove some ableist language
2022-08-28 21:46:05 -05:00
gamma-delta
95107b650a Merge branch 'main' of https://github.com/gamma-delta/HexMod 2022-08-28 21:26:01 -05:00
gamma-delta
6675e80ced Fix greater sentinel claiming it costs 2 dust while actually only costing 1 2022-08-28 21:25:54 -05:00
yrsegal@gmail.com
c41ad80907 plural of dust is dust, sometimes
it's a weird case of an uncountable word
2022-08-28 22:14:18 -04:00
yrsegal@gmail.com
d9a59830c8 fix a couple of inconsistencies in patchi book 2022-08-28 22:13:19 -04:00
yrsegal@gmail.com
f7163127df be a bit more lenient with blocked overcast damage 2022-08-28 19:55:52 -04:00
yrsegal@gmail.com
cf03cc95b5 fix enlightenment being effectively impossible to obtain 2022-08-28 19:34:24 -04:00
yrsegal@gmail.com
63db46aff9 fix nonsensical error messages for scribe's 2022-08-28 12:32:45 -04:00
ChuijkYahus
1bb85cb683
Update zh_cn.json 2022-08-28 16:44:50 +08:00
yrsegal@gmail.com
25fea447a5 fix selection of items for placing being weird 2022-08-27 09:11:19 -04:00
ChuijkYahus
e7068c60cb
Update en_us.json 2022-08-27 12:05:13 +08:00
ChuijkYahus
feece73908
Create vectors.json 2022-08-27 12:03:51 +08:00
ChuijkYahus
867b04966f
Update book.json 2022-08-27 12:03:04 +08:00
ChuijkYahus
afb06ddcc1
Create zh_cn.json 2022-08-27 12:02:27 +08:00
yrsegal@gmail.com
32fed35beb patterns now have innate names
currently only matters for mishaps
2022-08-26 14:40:38 -04:00
yrsegal@gmail.com
240f021194 Fluid creation hexes can insert partial, destroy fluid can drain tanks
Closes #216
2022-08-25 21:09:51 -04:00
yrsegal@gmail.com
6418e9b95e Akashic libraries now have a range limit 2022-08-25 21:08:15 -04:00
yrsegal@gmail.com
0ba1c36ad9 Phials now always show media amounts (in dust) 2022-08-25 21:06:18 -04:00
yrsegal@gmail.com
8ea5b53ee2 fix change to discovery not allowing for unstackables 2022-08-22 23:29:22 -04:00
yrsegal@gmail.com
2ae33cf82d fix #228 2022-08-22 22:34:00 -04:00
yrsegal@gmail.com
ed2abee735 fix double-use of getHeldItemToOperateOn 2022-08-22 22:29:00 -04:00
yrsegal@gmail.com
63be2d9a96 fix annotations not compiling 2022-08-18 17:18:16 -04:00
yrsegal@gmail.com
1afd21b5bb ManaHolders can now control recharging 2022-08-18 16:12:18 -04:00
yrsegal@gmail.com
2a097603cb operative slots are now a discovery as well 2022-08-17 13:47:44 -04:00
yrsegal@gmail.com
36321c3cd0 discovery of grid scale modifiers and item slots 2022-08-17 13:38:29 -04:00
yrsegal@gmail.com
cc5267d2a4 fix dupe bugs with yeeting 2022-08-16 23:17:39 -04:00
yrsegal@gmail.com
6c574fb9ac swap choice of casting and other
this makes trinkets preferentially recharge/erase/etc other things
2022-08-16 23:07:02 -04:00
yrsegal@gmail.com
8c13fc22dc media can now be drawn from trinkets, armor, and offhand
also, armor can no longer keep you safe from the subsuming of your mind
2022-08-16 22:11:51 -04:00
yrsegal@gmail.com
bcd897f4e1 fix some crashes with invalid angles via nbt editing 2022-08-13 14:24:44 -04:00
yrsegal@gmail.com
c3c63af67c curse of binding is respected by OpTeleport
this is mostly because oh god it can drop quark backpacks otherwise
2022-08-12 12:37:41 -04:00
yrsegal@gmail.com
c8f4e847b9 fix projection 2022-08-10 18:16:15 -04:00
yrsegal@gmail.com
1dcc3bc293 add icons for edify and phial in EMI
edify is just world interaction, but dani couldn't really come up with a good looking sapling
2022-08-10 07:05:39 -04:00
yrsegal@gmail.com
cbe1c77433 jei/rei/emi for edify and craft phial 2022-08-09 13:49:57 -04:00
yrsegal@gmail.com
027a3d0139 fix #194 2022-08-08 22:27:26 -04:00
yrsegal@gmail.com
b77d751357 fix thoth exceeding depth crashing instead of mishapping 2022-08-08 21:40:44 -04:00
yrsegal@gmail.com
24e98169e6 fix excisor's sometimes disintegrating lists 2022-08-06 17:22:13 -04:00
yrsegal@gmail.com
1febaf703a fix #196 2022-08-06 11:46:24 -04:00
yrsegal@gmail.com
65b33e70c7 fix #199 2022-08-06 11:43:34 -04:00
yrsegal@gmail.com
c53cc12d05 fix #197 2022-08-06 11:37:38 -04:00
yrsegal@gmail.com
958db00b15 close #201 2022-08-06 11:34:33 -04:00
yrsegal@gmail.com
d83c7accc7 fix #210 2022-08-06 11:11:23 -04:00
yrsegal@gmail.com
f281d4d561 fix #211 2022-08-06 11:00:52 -04:00
yrsegal@gmail.com
bd833486b6 skilletsexual 2022-08-06 09:38:33 -04:00
yrsegal@gmail.com
b34d676afb fix #206 2022-08-02 18:58:53 -04:00
yrsegal@gmail.com
513037bb1a fix double-tp 2022-07-31 09:21:00 -04:00
yrsegal@gmail.com
4ceb5416fb fix inconsistencies with teleport updating 2022-07-31 09:15:59 -04:00
yrsegal@gmail.com
a5d25eba2e this just in: farmers may be delighted 2022-07-27 23:08:55 -04:00
gamma-delta
e6767ae224 close #186 2022-07-27 11:55:59 -05:00
gamma-delta
4d95a57a17 version bump and close #190 2022-07-26 23:16:57 -05:00
gamma-delta
33b50f4a82 fix #188 2022-07-26 13:42:52 -05:00
gamma-delta
81e5f8581e close #189 (anything under 1 tick is a no-op) 2022-07-26 11:49:25 -05:00
yrsegal@gmail.com
868086009f port swindler's cost removal from 1.0 2022-07-26 10:29:57 -04:00
yrsegal@gmail.com
508dde11ef the lens sees the bees 2022-07-25 20:11:06 -04:00
yrsegal@gmail.com
e083b31101 cleanups 2022-07-25 13:16:08 -04:00
yrsegal@gmail.com
84b6448579 Merge branch 'main' of https://github.com/gamma-delta/HexMod into fix173+175
# Conflicts:
#	Fabric/src/main/java/at/petrak/hexcasting/fabric/FabricHexInitializer.kt
2022-07-25 13:07:38 -04:00
gattsuru
e677e54313 Improve Comments and Readability for AkashicTreeGrower init 2022-07-25 12:55:43 -04:00
yrsegal@gmail.com
4ed6f299e7 trinkets/curios integration 2022-07-25 10:56:23 -04:00
gattsuru
ffdf675444 Requested change. 2022-07-24 21:46:28 -04:00
yrsegal@gmail.com
1424cff844 add more block protection hooks
Port of 96e4569b24
2022-07-24 21:45:46 -04:00
yrsegal@gmail.com
96e4569b24 add more block protection hooks 2022-07-24 20:30:58 -04:00
yrsegal@gmail.com
54f0007315 Fix modulo having format error
port of 8f6bddb25c
2022-07-24 20:23:18 -04:00
yrsegal@gmail.com
e05720d80e Fix #110
port of 2e76655d21
2022-07-24 20:22:31 -04:00
yrsegal@gmail.com
41deea129c Close #160
port of 287fadc8ce
2022-07-24 20:20:07 -04:00
yrsegal@gmail.com
f0b85dfb3a Fix #135
port of 21ce790bb7
2022-07-24 20:16:51 -04:00
yrsegal@gmail.com
549d6f685c Fix #136
port of 1b01174186
2022-07-24 20:07:09 -04:00
yrsegal@gmail.com
25b594d75a Fix #156
port of 2be0021185
2022-07-24 20:04:36 -04:00
yrsegal@gmail.com
64c143cfe9 Fix #154
port of 02804df55c
2022-07-24 20:03:45 -04:00
yrsegal@gmail.com
150f646ddf Fix #152
port of 9d089a20a6
2022-07-24 20:03:07 -04:00
yrsegal@gmail.com
7e92a8352c fix the cost of bonemeal
port of b7561ce619
2022-07-24 20:02:21 -04:00
yrsegal@gmail.com
d46cafeb05 close #161, close #117
port of a42f6e87f8
2022-07-24 20:01:51 -04:00
yrsegal@gmail.com
e404aa7c2e fix #174 2022-07-24 19:54:14 -04:00
yrsegal@gmail.com
5201063d69 fix #172 2022-07-24 19:50:44 -04:00
yrsegal@gmail.com
941480e703 fix #182 2022-07-24 19:49:40 -04:00
yrsegal@gmail.com
3bd05c9484 fix #185 2022-07-24 19:48:23 -04:00
yrsegal@gmail.com
cc24932854 create compat 2022-07-24 16:51:57 -04:00
gattsuru
31c91a4826 Updates Fabric Config, Impulse docs
- Describes increase to costs for multi-Impulse spells
- Adds warnings for valid ranges for configs, since FabricConfig doesn't
2022-07-24 12:16:40 -04:00
yrsegal@gmail.com
87ed547716 flight is no longer broken 2022-07-24 11:56:30 -04:00
gattsuru
8824415611 Fix Flight Duration In Fabric 2022-07-22 14:58:17 -04:00
yrsegal@gmail.com
8f6bddb25c hello darkness my old friend 2022-07-21 08:25:04 -04:00
yrsegal@gmail.com
2e76655d21 Close #110 2022-07-03 00:00:10 -04:00
yrsegal@gmail.com
287fadc8ce Close #160 2022-07-02 23:59:10 -04:00
yrsegal@gmail.com
21ce790bb7 fix #135 2022-07-02 23:58:47 -04:00
yrsegal@gmail.com
1b01174186 fix #136 2022-07-02 23:23:28 -04:00
yrsegal@gmail.com
2be0021185 fix #156 2022-07-02 23:01:59 -04:00
yrsegal@gmail.com
02804df55c fix #154 2022-07-02 23:00:56 -04:00
yrsegal@gmail.com
9d089a20a6 Fix #152 2022-07-02 22:56:45 -04:00
yrsegal@gmail.com
b0accc1bfc Merge 2022-07-02 22:52:27 -04:00
yrsegal@gmail.com
b7561ce619 fix cost of bonemeal 2022-07-02 22:34:24 -04:00
yrsegal@gmail.com
a42f6e87f8 Close #161, #117 2022-07-02 22:33:54 -04:00
gamma-delta
c00815b7b9 [Release] 0.9.1 Release
Thank you for being patient with me.

- Hermes' Gambit now can execute single patterns, and update the docs on
  it
- Jeweler's Hammer now drops full amethyst loot. Also, add a bunch of
  other picks from various mods to the tag because everyone forgets.
  Also, you get a little bit of dust with the wrong tool anyways.
- Add config to change how far you have to move the mouse when casting
  with a staff to commit to a dot
- Fixed some bugs with Place Block
- Fix looking at a cleric impetus crashing sometimes
2022-06-27 10:24:16 -05:00
gamma-delta
d8412cfd11 version bump and make hermes on a pattern not inc depth 2022-06-27 10:20:05 -05:00
petrak@
bd0fda3b3a
Merge pull request #151 from KirinDave/update-hermes-doc
Start of addressing #146 (Hermes Documentation)
2022-06-26 11:20:03 -05:00
kirindave
951dbb7122 Update Hermes Gambit documentation & type signature to reflect new calling features. 2022-06-23 21:24:41 -07:00
Infinidoge
cdfea2ebc5 consolidate cluster_max_harvestables
Also fixes the build issue of duplicated source files
2022-06-24 00:17:25 -04:00
gamma-delta
fe01ffa927 other modders add their picks to cluster_max_harvestables challenge 2022-06-23 15:33:46 -05:00
gamma-delta
0f4c69d1f8 close #141. really good call, this feels much more sturdy at a high proportion 2022-06-23 15:27:07 -05:00
gamma-delta
96c8736930 close #125 2022-06-23 14:59:04 -05:00
gamma-delta
2bfa39b0f4 close #134 2022-06-23 14:19:27 -05:00
gamma-delta
b9f41abb5c how do you like that obama i pissed on the git 2022-06-16 11:52:20 -05:00
gamma-delta
675eaafe8b fix some problems with ravenminds breaking prescience 2022-06-16 11:49:07 -05:00
gamma-delta
d80ace0812 make the casting UI less of an eyesore maybe 2022-06-16 10:15:27 -05:00
gamma-delta
8ea2a6d66d merge in some fixes from main 2022-06-15 21:28:33 -05:00
gamma-delta
18277aec41 remove this dumb comment 2022-06-15 21:25:25 -05:00
gamma-delta
3763a33955 fix #124 2022-06-15 21:17:52 -05:00
gamma-delta
c922b13c3f fix #127 (they are actually in the right namespace, I just registered them to the datafixer wrong) 2022-06-15 21:17:18 -05:00
gamma-delta
744c6e1fd8 keep renaming things. fix #115 2022-06-15 21:00:46 -05:00
gamma-delta
3638ec7b01 close #126 2022-06-15 16:26:03 -05:00
yrsegal@gmail.com
f8468b8862 show skins for real for real this time 2022-06-15 17:04:41 -04:00
yrsegal@gmail.com
13d97af5bf fix looking at an old cleric impetus with a lens crashing 2022-06-15 16:54:09 -04:00
gamma-delta
726fc8427e merge in the lore 2022-06-14 20:42:52 -05:00
gamma-delta
bdec14b202 IT RUNS ON FORGE AND FABRIC 2022-06-14 20:41:03 -05:00
yrsegal@gmail.com
71a0b11d25 drop reduced dust and crystals even if not using the proper tool 2022-06-14 21:16:07 -04:00
yrsegal@gmail.com
bf5c908273 thoth always either evaluates or errors 2022-06-14 20:51:51 -04:00
gamma-delta
434c480b0b kotlin now compiles! ... now onto java 2022-06-14 14:35:06 -05:00
yrsegal@gmail.com
72a1f28902 fix place block using the wrong context 2022-06-14 10:20:40 -04:00
gamma-delta
8b7369fe8b do spells and finish up the harness ... now onto blocks! 2022-06-14 02:11:38 -05:00
gamma-delta
2917a3b358 who am i, wire? converted all non-spell actions to the new iotas 2022-06-14 01:02:20 -05:00
yrsegal@gmail.com
f2555fa4d6 fix #122 2022-06-13 23:29:47 -04:00
gamma-delta
71c3cade9b and now for the part of the show where we refactor every single operator 2022-06-13 22:02:50 -05:00
gamma-delta
8261063208 more manual fixes 2022-06-13 20:29:30 -05:00
yrsegal@gmail.com
a6369674ba sort tags 2022-06-13 21:28:03 -04:00
yrsegal@gmail.com
7286ddc8ae fix jeweler's hammer not dropping full amethyst loot 2022-06-13 21:26:12 -04:00
gamma-delta
6f4497a18f whoopsy it modified things in caches. oh well. 2022-06-13 19:41:13 -05:00
gamma-delta
7403d87e6f kotlin went great, now for java 2022-06-13 19:26:39 -05:00
gamma-delta
e00757331e pushing to have a backup if i mess up sed 2022-06-13 19:02:46 -05:00
gamma-delta
ba9028010f make foci/spellbooks overlays based 2022-06-13 18:38:24 -05:00
gamma-delta
d0f43ff0d9 rename lots of things 2022-06-13 16:45:22 -05:00
gamma-delta
fb246ef883 finish making types 2022-06-13 13:58:53 -05:00
gamma-delta
029869b247 make blink not free when less than a block 2022-06-13 12:29:30 -05:00
gamma-delta
a9c8be1212 still doesn't compile, but now feat. registries 2022-06-13 01:39:12 -05:00
gamma-delta
61926ca299 Rebase this onto the 1.0 branch 2022-06-12 23:57:16 -05:00
yrsegal@gmail.com
10c9d074b8 prevent nbt editing from causing crashes on foci and such 2022-06-12 22:33:48 -04:00
gamma-delta
fef331d8e0 formatting 2022-06-12 20:30:05 -05:00
gamma-delta
06c7f97585 whoops 2022-06-12 20:29:47 -05:00
yrsegal@gmail.com
fc225b1afa fix impetus player head loading being weird 2022-06-12 19:53:14 -04:00
gamma-delta
411e85579f fix the jar not including everything on forge 2022-06-12 17:00:38 -05:00
gamma-delta
952b53eaed this actually seems more helpful 2022-06-12 15:10:45 -05:00
gamma-delta
c8e252497c *actually* close #102 2022-06-12 15:07:49 -05:00
gamma-delta
6ad14e6fc8 close #101 ... well, more like touch up 2022-06-12 15:06:10 -05:00
gamma-delta
bf4682260d close #114 2022-06-12 13:48:20 -05:00
gamma-delta
608fd0e4c2 close #116 and also whoops i forgor to run datagen in a while 2022-06-12 12:38:45 -05:00
gamma-delta
8ef43af35d Close #113 and document naming pages 2022-06-12 12:13:47 -05:00
gamma-delta
c4a5f97129 close #102 2022-06-12 11:55:18 -05:00
gamma-delta
1b1b43dcfe Close 112 2022-06-12 11:54:28 -05:00
yrsegal@gmail.com
3019e4c35a oops. 2022-06-11 18:43:48 -04:00
yrsegal@gmail.com
cea2d33cfa make weakmapped safer, and document 2022-06-11 18:38:45 -04:00
gamma-delta
c16002e832 ok jk i want 8x scale 2022-06-10 18:45:55 -05:00
gamma-delta
25afe5a74b yeah i probably shouldve seen that one coming 2022-06-10 18:41:22 -05:00
gamma-delta
6109fffc32 Merge branch 'main' of https://github.com/gamma-delta/HexMod 2022-06-09 20:32:39 -05:00
gamma-delta
b7a554dd75 make the spell circle spells no longer great 2022-06-09 20:32:25 -05:00
yrsegal@gmail.com
481a9aef5d don't use valueOf explicitly 2022-06-09 19:18:24 -04:00
yrsegal@gmail.com
233fb28eac make some progress towards fixing fabulous conjures 2022-06-09 17:02:19 -04:00
yrsegal@gmail.com
b0bdbb7d76 fix some villager and rendering jank 2022-06-09 17:01:51 -04:00
gamma-delta
b743c8e7a2 they're called staves, wire 2022-06-09 14:48:46 -05:00
gamma-delta
63ea5822dd hopefully prevent fork bombs, fix #106 2022-06-09 13:54:30 -05:00
yrsegal@gmail.com
8cbcea2833 fix the sentinel sometimes rendering weird 2022-06-08 20:50:25 -04:00
yrsegal@gmail.com
ae89127572 fix a stateleak 2022-06-07 19:22:09 -04:00
yrsegal@gmail.com
0895fc972c fix obfuscation 2022-06-07 19:22:09 -04:00
yrsegal@gmail.com
2ddd3c54e4 more categories 2022-06-07 19:22:09 -04:00
yrsegal@gmail.com
86c57198ce for height modifiers 2022-06-07 19:22:09 -04:00
yrsegal@gmail.com
c4dceeeede weak reference utils, migrate villager prep code into central location 2022-06-07 19:22:09 -04:00
yrsegal@gmail.com
b25cffd814 some minor tag changes 2022-06-07 19:22:09 -04:00
yrsegal@gmail.com
69b7177ee6 localize some tags 2022-06-07 19:22:09 -04:00
yrsegal@gmail.com
70067b97bc show "minecraft:villager" if no profession 2022-06-07 19:22:09 -04:00
yrsegal@gmail.com
f91b26057e advanced/regular tooltips 2022-06-07 19:22:09 -04:00
yrsegal@gmail.com
d188a20366 you ever just grayscale 2022-06-07 19:22:09 -04:00
yrsegal@gmail.com
28404a6593 emi! 2022-06-07 19:22:09 -04:00
yrsegal@gmail.com
e246d31926 fix CI not building 2022-06-07 19:21:57 -04:00
yrsegal@gmail.com
811adff148 huh, boolean flip here 2022-06-07 19:10:18 -04:00
yrsegal@gmail.com
54724ac95e fix custom item handlers being weeeird with impetuses
I also finally got that fabric fluid transfer thing implemented, woo
2022-06-07 17:41:20 -04:00
yrsegal@gmail.com
4e6d47de41 resolve fabric todos 2022-06-07 14:57:16 -04:00
yrsegal@gmail.com
59378e8031 i need to stop copypasting 2022-06-06 22:03:23 -04:00
yrsegal@gmail.com
01dba3419d fix potion effects being able to go into the weird negative range 2022-06-06 21:10:20 -04:00
yrsegal@gmail.com
51a4ae9dcd fix impetus only showing it's bound when bound to a player in world 2022-06-06 10:09:23 -04:00
yrsegal@gmail.com
df6e018d7c fix lang 2022-06-06 10:03:20 -04:00
gamma-delta
1c4a64cc1c do the rest of it; page layout cleanup todo 2022-06-05 01:39:24 -05:00
yrsegal@gmail.com
9b0487688c creative unlocker now can show you mana usages 2022-06-04 18:17:10 -04:00
yrsegal@gmail.com
31d40b7555 migrate old colorizers 2022-06-04 14:27:55 -04:00
gamma-delta
1b22e63a1f start work on lore 2022-06-04 13:01:09 -05:00
yrsegal@gmail.com
0edc687a60 open up scroll loot tables to config 2022-06-04 12:23:25 -04:00
yrsegal@gmail.com
e61b5c1255 fix comparator output not showing on fabric 2022-06-04 10:24:31 -04:00
yrsegal@gmail.com
f08959d90e fix akashic records not working on fabric 2022-06-04 10:18:00 -04:00
gamma-delta
2d049114ba for FILE in *.png.mcmeta; do jq '.animation.frames |= [to_entries | .[] | {index: .key} + .value]' $FILE > $FILE.out; done 2022-06-03 22:09:40 -05:00
gamma-delta
c121211369 messed up the json generation; pushing a commit to have somewhere to fall back on if jq fails 2022-06-03 21:59:19 -05:00
yrsegal@gmail.com
2e6dda478f name the local 2022-06-03 16:46:50 -04:00