gamma-delta
|
05eaaf1d2a
|
prevent weird dev modmenu crash and update bool display
|
2022-11-06 12:47:28 -06: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 |
|
gamma-delta
|
e5a077f67e
|
it compiles on fabc!
|
2022-11-04 18:21:08 +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 |
|
yrsegal@gmail.com
|
63be2d9a96
|
fix annotations not compiling
|
2022-08-18 17:18:16 -04:00 |
|
yrsegal@gmail.com
|
bde6f9ad59
|
fix all the CC crashes
|
2022-08-17 08:13:48 -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
|
cc24932854
|
create compat
|
2022-07-24 16:51:57 -04:00 |
|
Infinidoge
|
c8d650b97f
|
fusions-gravity-api -> gravity-api
|
2022-06-23 23:51:31 -04:00 |
|
yrsegal@gmail.com
|
bac2315f46
|
Emi public release!
|
2022-06-08 12:02:02 -04:00 |
|
yrsegal@gmail.com
|
ae89127572
|
fix a stateleak
|
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
|
8e4ed23190
|
include cc api
|
2022-06-02 21:42:27 -04:00 |
|
yrsegal@gmail.com
|
055606d587
|
prepare for when ser hooks changes
|
2022-06-02 19:41:18 -04:00 |
|
yrsegal@gmail.com
|
7a2acf25ba
|
move ser hooks out of optional section
|
2022-06-02 16:32:40 -04:00 |
|
yrsegal@gmail.com
|
25326ff5ec
|
include
|
2022-06-02 16:21:58 -04:00 |
|
yrsegal@gmail.com
|
de5856ef59
|
ingredients now use a library instead of hax
|
2022-06-02 16:14:15 -04:00 |
|
gamma-delta
|
bf35952778
|
lilliputian
|
2022-06-02 02:11:48 -05:00 |
|
gamma-delta
|
272f81e36b
|
add gravichanger compat, add stubs for pehkui, and rebalance flight
|
2022-06-01 21:53:24 -05:00 |
|
yrsegal@gmail.com
|
dbe83eb140
|
roughly enough compatability
|
2022-05-31 21:43:05 -04:00 |
|
gamma-delta
|
bb2b784f4f
|
hopefully let CI work again (man i can't believe no one checked in that long)
|
2022-05-27 17:02:51 -05:00 |
|
gamma-delta
|
9ccfba83f9
|
datagen that i havent tested at all
|
2022-05-23 17:01:22 -05:00 |
|
gamma-delta
|
082dbc15d7
|
half-implement xplat datagen
|
2022-05-23 14:21:13 -05:00 |
|
gamma-delta
|
fef9e5f011
|
fix #83
|
2022-05-21 17:45:40 -05:00 |
|
gamma-delta
|
bc38d0e1b4
|
stop making common jars, hopefully
|
2022-05-21 16:11:38 -05:00 |
|
gamma-delta
|
feeace32ed
|
possibly fix refmap errors in non-dev
|
2022-05-20 17:00:08 -05:00 |
|
gamma-delta
|
b5afce1b83
|
IT FUCKIN WORKS YOOOOOOOO
|
2022-05-19 19:33:28 -05:00 |
|
yrsegal@gmail.com
|
2d629f409d
|
spellbook/focus recipes are now in JEI
|
2022-05-18 22:04:15 +01:00 |
|
gamma-delta
|
8c061bdd3c
|
GOOD ENOUGH
|
2022-05-15 19:56:15 -05:00 |
|
gamma-delta
|
38036669e3
|
aaaaaaaaa
|
2022-05-15 16:48:18 -05:00 |
|
gamma-delta
|
6ad894849a
|
inch by inch. todo remove kotlin from the api
|
2022-05-15 12:58:14 -05:00 |
|
gamma-delta
|
d64bd20868
|
IT LAUNCHES and then immediately crashes
|
2022-05-15 11:49:28 -05:00 |
|
gamma-delta
|
4332c37afa
|
off to nuke and redownload the whole repo
|
2022-05-14 20:26:08 -05:00 |
|
gamma-delta
|
f0e697bc53
|
nothing workksssss
|
2022-05-14 15:15:25 -05:00 |
|
gamma-delta
|
bf600b00ec
|
fabric why
|
2022-05-13 23:50:57 -05:00 |
|
gamma-delta
|
ac02f3c5d3
|
its ALMOST THERE I THINK
|
2022-05-11 16:23:39 -05:00 |
|
gamma-delta
|
c2c3ac6baa
|
i am typing words
|
2022-05-09 13:23:39 -05:00 |
|
gamma-delta
|
2bae373b38
|
implement all (hopefully?) the cardinal components and make items no longer use RegistryObjects
|
2022-04-30 15:58:17 -05:00 |
|
gamma-delta
|
0938673eb8
|
possibly, maybe, get config working as a warmup
|
2022-04-25 15:52:03 -05:00 |
|
gamma-delta
|
7f71e146c5
|
nothing works, almost!
|
2022-04-25 09:40:32 -05:00 |
|