Commit graph

245 commits

Author SHA1 Message Date
petrak@ e37d08d81e compiling is a myth invented by big code 2023-02-02 13:05:47 -06:00
petrak@ af03b8c321 close #401 2023-02-01 09:59:45 -06:00
petrak@ 4f5cbb12fc fix #364 (good catch) 2023-01-31 19:04:15 -06:00
petrak@ d1640d956a close #370 2023-01-30 13:36:52 -06:00
petrak@ abc2e7862b yatta! close #377 and make lore spawn lmao 2023-01-23 14:31:19 -06:00
petrak@ aca2c19be6 first smoketestable 2023-01-22 23:59:19 -06:00
petrak@ edc4012f69 loot cleanup wip! 2023-01-22 21:59:48 -06:00
petrak@ 91399cd5e0 finish close #360 2023-01-22 21:06:42 -06:00
petrak@ 7e3cdb2f1a fix bad loc on jei pat recipes 2023-01-22 20:08:49 -06:00
petrak@ 9d2d56916a fix bowlglimmer and ligature costs, re #360, closes #351 2023-01-22 20:06:54 -06:00
petrak@ ebf43e15f2 prevent render brainsweep crash on fabric. todo: how to make villager regalia show up 2023-01-22 13:52:43 -06:00
petrak@ 39ef925229 close #374 2023-01-22 12:47:26 -06:00
petrak@ 8b0a01e825 close #378 2023-01-21 20:29:09 -06:00
petrak@ 4010ea6d9e move more things 2023-01-21 17:35:41 -06:00
petrak@ 05e4114b97 fully make greatness a tag 2023-01-21 15:49:20 -06:00
petrak@ 2f2ab69816 fixed action tags not working on fabc 2023-01-21 14:51:40 -06:00
petrak@ 4af930e7a7 data: genned 2023-01-21 13:23:24 -06:00
petrak@ ede95c4b49 creeping towards compilation 2023-01-21 11:53:23 -06:00
petrak@ 5d8b7a61eb this does not compile even a little bit but i'm pushing so i'm not anxious having code on my HD 2023-01-20 13:27:35 -06:00
petrak@ 7748cf7387 that sucked 2022-12-30 17:00:52 -05:00
petrak@ 573fbb738a oh god, this is gonna suck 2022-12-30 13:43:38 -05:00
petrak@ 5f9ced55fc clean up xplat 2022-12-30 13:07:21 -05:00
petrak@ bdbb8b0e83 MVP ready 2022-12-30 13:00:47 -05:00
petrak@ a0fde191d4 keep on mergin 2022-12-03 11:16:22 -05:00
petrak@ 949e4bb292 fix #325 2022-11-29 15:24:44 -05:00
petrak@ 33ba0ee4e1 rrgh 2022-11-29 12:07:08 -05:00
petrak@ 7c00cbaec8 possibly impl arbitrary brainsweeps. i don't know. i'm in offline mode 2022-11-22 19:31:09 -06:00
petrak@ 274bec11d6 fix 292 2022-11-21 21:59:22 -06:00
petrak@ 76006d72dc finish sound cleanup and also other things cleanup 2022-11-21 19:48:25 -06:00
petrak@ 7699a5e468 start work on making sounds badnt 2022-11-21 17:55:36 -06:00
petrak@ 3f9c3a4561 badn't config 2022-11-21 14:07:27 -06:00
petrak@ 9a276c70de clip the end of the pattern line in certain cases for visibility 2022-11-20 22:38:35 -06:00
petrak@ c2edcd68c1 probably fix #286 again 2022-11-20 15:54:20 -06:00
petrak@ 7dc05d2951 maybe fix #286 2022-11-19 21:21:42 -06:00
gamma-delta 9ca5738317 WITH CATLIKE TREAD! UPON OUR PREY WE STEAL! IN SILENCE DREAD! OUR CAUTIOUS WAY WE FEEL! NO SOUND AT ALL! WE NEVER SPEAK A WORD! A FLY'S FOOTFALL WOULD BE DISTINCTLY HEARD! 2022-11-15 21:09:30 -06:00
gamma-delta 03dd09c6de amethyst dust now makes scrolls have the offset marks 2022-11-14 20:35:48 -06:00
yrsegal@gmail.com 61e292af10 finish mana -> media 2022-11-09 19:50:37 -05:00
yrsegal@gmail.com fde595a6ce mother of all merges 2022-11-05 23:19:04 -04:00
yrsegal@gmail.com a01ff27453 Merge branch 'main' into 1.0
# Conflicts:
#	Common/src/generated/resources/.cache/cache
#	Common/src/generated/resources/assets/hexcasting/models/block/conjured.json
#	Common/src/main/java/at/petrak/hexcasting/api/PatternRegistry.kt
#	Common/src/main/java/at/petrak/hexcasting/api/addldata/ManaHolder.java
#	Common/src/main/java/at/petrak/hexcasting/api/block/circle/BlockEntityAbstractImpetus.java
#	Common/src/main/java/at/petrak/hexcasting/api/item/ColorizerItem.java
#	Common/src/main/java/at/petrak/hexcasting/api/item/DataHolderItem.java
#	Common/src/main/java/at/petrak/hexcasting/api/item/HexHolderItem.java
#	Common/src/main/java/at/petrak/hexcasting/api/item/ManaHolderItem.java
#	Common/src/main/java/at/petrak/hexcasting/api/spell/Action.kt
#	Common/src/main/java/at/petrak/hexcasting/api/spell/SpellDatum.kt
#	Common/src/main/java/at/petrak/hexcasting/api/spell/Widget.kt
#	Common/src/main/java/at/petrak/hexcasting/api/spell/casting/CastingContext.kt
#	Common/src/main/java/at/petrak/hexcasting/api/spell/casting/CastingHarness.kt
#	Common/src/main/java/at/petrak/hexcasting/api/spell/mishaps/MishapNoSpellCircle.kt
#	Common/src/main/java/at/petrak/hexcasting/api/spell/mishaps/MishapNotEnoughArgs.kt
#	Common/src/main/java/at/petrak/hexcasting/api/utils/ManaHelper.kt
#	Common/src/main/java/at/petrak/hexcasting/client/RegisterClientStuff.java
#	Common/src/main/java/at/petrak/hexcasting/client/ShiftScrollListener.java
#	Common/src/main/java/at/petrak/hexcasting/client/gui/GuiSpellcasting.kt
#	Common/src/main/java/at/petrak/hexcasting/common/blocks/akashic/BlockAkashicFloodfiller.java
#	Common/src/main/java/at/petrak/hexcasting/common/blocks/entity/BlockEntityStoredPlayerImpetus.java
#	Common/src/main/java/at/petrak/hexcasting/common/casting/RegisterPatterns.java
#	Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpBlockAxisRaycast.kt
#	Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpTheCoolerRead.kt
#	Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpTheCoolerReadable.kt
#	Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpWrite.kt
#	Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpRemove.kt
#	Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpPowProj.kt
#	Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/logic/OpBoolIdentityKindOf.kt
#	Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpBreakBlock.kt
#	Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpConjureBlock.kt
#	Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpCreateWater.kt
#	Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpDestroyWater.kt
#	Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpEdifySapling.kt
#	Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpErase.kt
#	Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpExplode.kt
#	Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpExtinguish.kt
#	Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpIgnite.kt
#	Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpMakeBattery.kt
#	Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpMakePackagedSpell.kt
#	Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpPlaceBlock.kt
#	Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpPotionEffect.kt
#	Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpRecharge.kt
#	Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpTheOnlyReasonAnyoneDownloadedPsi.kt
#	Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/great/OpBrainsweep.kt
#	Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/great/OpCreateLava.kt
#	Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/great/OpTeleport.kt
#	Common/src/main/java/at/petrak/hexcasting/common/casting/operators/stack/OpAlwinfyHasAscendedToABeingOfPureMath.kt
#	Common/src/main/java/at/petrak/hexcasting/common/casting/operators/stack/OpMask.kt
#	Common/src/main/java/at/petrak/hexcasting/common/command/ListPatternsCommand.java
#	Common/src/main/java/at/petrak/hexcasting/common/items/magic/ItemCreativeUnlocker.java
#	Common/src/main/java/at/petrak/hexcasting/common/items/magic/ItemMediaHolder.java
#	Common/src/main/java/at/petrak/hexcasting/common/lib/HexBlocks.java
#	Common/src/main/java/at/petrak/hexcasting/common/lib/HexItems.java
#	Common/src/main/java/at/petrak/hexcasting/common/misc/AkashicTreeGrower.java
#	Common/src/main/java/at/petrak/hexcasting/common/network/MsgNewSpellPatternAck.java
#	Common/src/main/java/at/petrak/hexcasting/common/network/MsgShiftScrollSyn.java
#	Common/src/main/java/at/petrak/hexcasting/datagen/HexAdvancements.java
#	Common/src/main/java/at/petrak/hexcasting/datagen/HexItemTagProvider.java
#	Common/src/main/java/at/petrak/hexcasting/datagen/recipe/HexplatRecipes.kt
#	Common/src/main/java/at/petrak/hexcasting/mixin/accessor/client/AccessorMouseHandler.java
#	Common/src/main/java/at/petrak/hexcasting/xplat/IXplatAbstractions.java
#	Common/src/main/resources/assets/hexcasting/lang/en_us.json
#	Fabric/gradle.properties
#	Fabric/src/generated/resources/.cache/cache
#	Fabric/src/generated/resources/data/hexcasting/recipes/dye_colorizer_black.json
#	Fabric/src/generated/resources/data/hexcasting/recipes/dye_colorizer_blue.json
#	Fabric/src/generated/resources/data/hexcasting/recipes/dye_colorizer_brown.json
#	Fabric/src/generated/resources/data/hexcasting/recipes/dye_colorizer_cyan.json
#	Fabric/src/generated/resources/data/hexcasting/recipes/dye_colorizer_gray.json
#	Fabric/src/generated/resources/data/hexcasting/recipes/dye_colorizer_green.json
#	Fabric/src/generated/resources/data/hexcasting/recipes/dye_colorizer_light_blue.json
#	Fabric/src/generated/resources/data/hexcasting/recipes/dye_colorizer_light_gray.json
#	Fabric/src/generated/resources/data/hexcasting/recipes/dye_colorizer_lime.json
#	Fabric/src/generated/resources/data/hexcasting/recipes/dye_colorizer_magenta.json
#	Fabric/src/generated/resources/data/hexcasting/recipes/dye_colorizer_orange.json
#	Fabric/src/generated/resources/data/hexcasting/recipes/dye_colorizer_pink.json
#	Fabric/src/generated/resources/data/hexcasting/recipes/dye_colorizer_purple.json
#	Fabric/src/generated/resources/data/hexcasting/recipes/dye_colorizer_red.json
#	Fabric/src/generated/resources/data/hexcasting/recipes/dye_colorizer_white.json
#	Fabric/src/generated/resources/data/hexcasting/recipes/dye_colorizer_yellow.json
#	Fabric/src/generated/resources/data/hexcasting/recipes/pride_colorizer_agender.json
#	Fabric/src/generated/resources/data/hexcasting/recipes/pride_colorizer_aroace.json
#	Fabric/src/generated/resources/data/hexcasting/recipes/pride_colorizer_aromantic.json
#	Fabric/src/generated/resources/data/hexcasting/recipes/pride_colorizer_asexual.json
#	Fabric/src/generated/resources/data/hexcasting/recipes/pride_colorizer_bisexual.json
#	Fabric/src/generated/resources/data/hexcasting/recipes/pride_colorizer_demiboy.json
#	Fabric/src/generated/resources/data/hexcasting/recipes/pride_colorizer_demigirl.json
#	Fabric/src/generated/resources/data/hexcasting/recipes/pride_colorizer_gay.json
#	Fabric/src/generated/resources/data/hexcasting/recipes/pride_colorizer_genderfluid.json
#	Fabric/src/generated/resources/data/hexcasting/recipes/pride_colorizer_genderqueer.json
#	Fabric/src/generated/resources/data/hexcasting/recipes/pride_colorizer_intersex.json
#	Fabric/src/generated/resources/data/hexcasting/recipes/pride_colorizer_lesbian.json
#	Fabric/src/generated/resources/data/hexcasting/recipes/pride_colorizer_nonbinary.json
#	Fabric/src/generated/resources/data/hexcasting/recipes/pride_colorizer_pansexual.json
#	Fabric/src/generated/resources/data/hexcasting/recipes/pride_colorizer_plural.json
#	Fabric/src/generated/resources/data/hexcasting/recipes/pride_colorizer_transgender.json
#	Fabric/src/main/java/at/petrak/hexcasting/fabric/FabricHexClientInitializer.kt
#	Fabric/src/main/java/at/petrak/hexcasting/fabric/FabricHexConfig.java
#	Fabric/src/main/java/at/petrak/hexcasting/fabric/FabricHexInitializer.kt
#	Fabric/src/main/java/at/petrak/hexcasting/fabric/cc/CCDataHolder.java
#	Fabric/src/main/java/at/petrak/hexcasting/fabric/cc/HexCardinalComponents.java
#	Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/emi/EmiBrainsweepRecipe.java
#	Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/emi/HexEMIPlugin.java
#	Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/rei/BrainsweepRecipeCategory.java
#	Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/rei/HexREIPlugin.java
#	Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/rei/PatternRendererREI.java
#	Fabric/src/main/java/at/petrak/hexcasting/fabric/recipe/FabricUnsealedIngredient.java
#	Fabric/src/main/java/at/petrak/hexcasting/fabric/storage/FabricImpetusStorage.kt
#	Fabric/src/main/java/at/petrak/hexcasting/fabric/xplat/FabricXplatImpl.java
#	Fabric/src/main/resources/fabric.mod.json
#	Forge/build.gradle
#	Forge/gradle.properties
#	Forge/src/generated/resources/.cache/cache
#	Forge/src/generated/resources/data/hexcasting/recipes/dye_colorizer_black.json
#	Forge/src/generated/resources/data/hexcasting/recipes/dye_colorizer_blue.json
#	Forge/src/generated/resources/data/hexcasting/recipes/dye_colorizer_brown.json
#	Forge/src/generated/resources/data/hexcasting/recipes/dye_colorizer_cyan.json
#	Forge/src/generated/resources/data/hexcasting/recipes/dye_colorizer_gray.json
#	Forge/src/generated/resources/data/hexcasting/recipes/dye_colorizer_green.json
#	Forge/src/generated/resources/data/hexcasting/recipes/dye_colorizer_light_blue.json
#	Forge/src/generated/resources/data/hexcasting/recipes/dye_colorizer_light_gray.json
#	Forge/src/generated/resources/data/hexcasting/recipes/dye_colorizer_lime.json
#	Forge/src/generated/resources/data/hexcasting/recipes/dye_colorizer_magenta.json
#	Forge/src/generated/resources/data/hexcasting/recipes/dye_colorizer_orange.json
#	Forge/src/generated/resources/data/hexcasting/recipes/dye_colorizer_pink.json
#	Forge/src/generated/resources/data/hexcasting/recipes/dye_colorizer_purple.json
#	Forge/src/generated/resources/data/hexcasting/recipes/dye_colorizer_red.json
#	Forge/src/generated/resources/data/hexcasting/recipes/dye_colorizer_white.json
#	Forge/src/generated/resources/data/hexcasting/recipes/dye_colorizer_yellow.json
#	Forge/src/generated/resources/data/hexcasting/recipes/pride_colorizer_agender.json
#	Forge/src/generated/resources/data/hexcasting/recipes/pride_colorizer_aroace.json
#	Forge/src/generated/resources/data/hexcasting/recipes/pride_colorizer_aromantic.json
#	Forge/src/generated/resources/data/hexcasting/recipes/pride_colorizer_asexual.json
#	Forge/src/generated/resources/data/hexcasting/recipes/pride_colorizer_bisexual.json
#	Forge/src/generated/resources/data/hexcasting/recipes/pride_colorizer_demiboy.json
#	Forge/src/generated/resources/data/hexcasting/recipes/pride_colorizer_demigirl.json
#	Forge/src/generated/resources/data/hexcasting/recipes/pride_colorizer_gay.json
#	Forge/src/generated/resources/data/hexcasting/recipes/pride_colorizer_genderfluid.json
#	Forge/src/generated/resources/data/hexcasting/recipes/pride_colorizer_genderqueer.json
#	Forge/src/generated/resources/data/hexcasting/recipes/pride_colorizer_intersex.json
#	Forge/src/generated/resources/data/hexcasting/recipes/pride_colorizer_lesbian.json
#	Forge/src/generated/resources/data/hexcasting/recipes/pride_colorizer_nonbinary.json
#	Forge/src/generated/resources/data/hexcasting/recipes/pride_colorizer_pansexual.json
#	Forge/src/generated/resources/data/hexcasting/recipes/pride_colorizer_plural.json
#	Forge/src/generated/resources/data/hexcasting/recipes/pride_colorizer_transgender.json
#	Forge/src/main/java/at/petrak/hexcasting/forge/ForgeHexClientInitializer.java
#	Forge/src/main/java/at/petrak/hexcasting/forge/ForgeHexConfig.java
#	Forge/src/main/java/at/petrak/hexcasting/forge/ForgeHexInitializer.java
#	Forge/src/main/java/at/petrak/hexcasting/forge/cap/ForgeCapabilityHandler.java
#	Forge/src/main/java/at/petrak/hexcasting/forge/cap/ForgeImpetusCapability.java
#	Forge/src/main/java/at/petrak/hexcasting/forge/datagen/HexForgeDataGenerators.java
#	Forge/src/main/java/at/petrak/hexcasting/forge/datagen/xplat/HexBlockStatesAndModels.java
#	Forge/src/main/java/at/petrak/hexcasting/forge/interop/jei/HexJEIPlugin.java
#	Forge/src/main/java/at/petrak/hexcasting/forge/recipe/ForgeUnsealedIngredient.java
#	Forge/src/main/java/at/petrak/hexcasting/forge/xplat/ForgeXplatImpl.java
#	Forge/src/main/resources/META-INF/accesstransformer.cfg
#	gradle.properties
2022-11-05 21:49:59 -04:00
yrsegal@gmail.com 63495a423f unify tabs (this will make the merge about 1000x easier) 2022-11-05 21:16:22 -04:00
yrsegal@gmail.com 95b78b551b fix #162 2022-11-05 15:30:38 -04:00
yrsegal@gmail.com ae07475528 fix #193, #192 2022-11-05 15:04:39 -04:00
yrsegal@gmail.com e7382036d9 Fix z-fighting and use forge render type format
Closes #163
2022-11-05 15:04:38 -04:00
gamma-delta 2e6551010f clean up some more old names 2022-11-04 19:48:39 -05:00
gamma-delta 5295a0e4b9 forge coughs to life 2022-11-04 19:41:02 -05:00
gamma-delta e5a077f67e it compiles on fabc! 2022-11-04 18:21:08 +01:00
gamma-delta d148552a81 *now* it's compiling, at least on forge 2022-11-04 17:31:18 +01:00
gamma-delta 24d8390ec9 very smol formt 2022-11-03 20:40:45 +01:00
gamma-delta aa9e871352 dumb mistake! jei compiles now 2022-11-03 20:33:51 +01:00
gamma-delta 7c65777e22 it compiles! 2022-11-03 18:29:48 +01:00
gamma-delta e3c5321426 start getting on 1.19 2022-11-03 16:31:05 +01:00
gamma-delta 5a8f8317c9 port lookup to java 2022-11-02 15:49:49 +01:00
yrsegal@gmail.com 5193a20a0a Another debug cube feature 2022-10-17 21:53:19 -04:00
yrsegal@gmail.com 1d6bb87864 Close #123 2022-10-01 12:52:37 -04:00
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 ee05eb1a4e please let this work i'm begging you 2022-08-30 09:45:55 -04:00
yrsegal@gmail.com a66a1f0cf9 does THIS make it include the refmap? it did on my end 2022-08-30 09:39:56 -04:00
yrsegal@gmail.com 73e13a576d fix gradle I promise 2022-08-29 23:27:20 -04:00
yrsegal@gmail.com 73596a244e ok I actually 100% for sure got gradle faster now 2022-08-29 17:39:43 -04: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
petrak@ d327d4d943
Merge branch 'main' into fix173+175 2022-08-28 22:11:54 -05: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
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 7e780b5dca Fix an issue with the pan recipe 2022-08-25 14:02:15 -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 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 f66eeeb148 *sigh*
close #217
2022-08-12 12:19:11 -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 1978cf9c93 fix FD on fabric being behind and making pan uncraftable 2022-08-07 20:01:50 -04:00
yrsegal@gmail.com 07d8f5a839 fix config key for pattern points 2022-08-06 11:58:47 -04:00
yrsegal@gmail.com d83c7accc7 fix #210 2022-08-06 11:11:23 -04:00
yrsegal@gmail.com bd833486b6 skilletsexual 2022-08-06 09:38:33 -04:00
yrsegal@gmail.com a5d25eba2e this just in: farmers may be delighted 2022-07-27 23:08:55 -04:00
gattsuru fe6703f778 Fix Forge Init 2022-07-25 14:09:37 -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
yrsegal@gmail.com 1424cff844 add more block protection hooks
Port of 96e4569b24
2022-07-24 21:45:46 -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 d46cafeb05 close #161, close #117
port of a42f6e87f8
2022-07-24 20:01:51 -04:00
yrsegal@gmail.com cc24932854 create compat 2022-07-24 16:51:57 -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 b0accc1bfc Merge 2022-07-02 22:52:27 -04:00
yrsegal@gmail.com a42f6e87f8 Close #161, #117 2022-07-02 22:33:54 -04: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 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 8ea2a6d66d merge in some fixes from main 2022-06-15 21:28:33 -05:00
gamma-delta 744c6e1fd8 keep renaming things. fix #115 2022-06-15 21:00:46 -05: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
gamma-delta 434c480b0b kotlin now compiles! ... now onto java 2022-06-14 14:35:06 -05:00
yrsegal@gmail.com 1a1302b67e fix sealing not working 2022-06-13 22:25:32 -04:00