Commit Graph

Select branches

Hide Pull Requests

master

mu

release/2.9.x

#1

#10

#100

#101

#102

#103

#104

#105

#106

#107

#108

#109

#11

#110

#111

#112

#113

#114

#115

#116

#117

#118

#119

#12

#120

#121

#122

#123

#124

#125

#126

#127

#128

#129

#13

#130

#131

#132

#133

#134

#135

#136

#137

#138

#139

#14

#140

#141

#142

#143

#144

#145

#146

#147

#148

#149

#15

#150

#151

#152

#153

#153/merge

#154

#155

#16

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#51

#52

#53

#54

#55

#56

#57

#58

#59

#6

#60

#61

#62

#63

#64

#65

#66

#67

#68

#69

#7

#70

#71

#72

#73

#74

#75

#76

#77

#78

#79

#8

#80

#81

#82

#83

#84

#85

#86

#87

#88

#89

#9

#90

#91

#92

#93

#94

#95

#96

#97

#98

#99

1.10.0

1.3.10

1.3.11-pre

1.3.12-pre

1.3.13

1.3.14

1.3.15

1.3.16

1.3.17

1.3.18

1.3.19

1.3.20

1.3.21

1.3.22

1.3.23-pre

1.3.24

1.3.25

1.3.3-29

1.3.3-30

1.3.3-43

1.3.3-44

1.3.3.24

1.3.4

1.3.5

1.3.6

1.3.7

1.3.8

1.3.9

1.3.9-pre

1.4.0

1.4.1

1.4.2

1.4.3

1.4.4-pre

1.5.0

1.5.1

1.5.2

1.5.3

1.5.4

1.6.0

1.6.1

1.6.10

1.6.11

1.6.2

1.6.3

1.6.4

1.6.5

1.6.6

1.6.7

1.6.9

1.7.0

1.7.1

1.7.10-pre

1.7.11

1.7.12-pre

1.7.13-pre

1.7.14-pre

1.7.15

1.7.16-pre

1.7.17

1.7.18-pre

1.7.19

1.7.2

1.7.20-pre

1.7.21-pre

1.7.22-pre

1.7.23

1.7.24-pre

1.7.25

1.7.26-pre

1.7.27-pre

1.7.28-pre

1.7.29

1.7.3

1.7.30-pre

1.7.31

1.7.32

1.7.33-pre

1.7.34-pre

1.7.35

1.7.36

1.7.37-pre

1.7.38

1.7.39

1.7.4

1.7.40

1.7.41-pre

1.7.42-pre

1.7.43

1.7.44-pre

1.7.45-pre

1.7.46

1.7.47-pre

1.7.48

1.7.49

1.7.5

1.7.50

1.7.51

1.7.52

1.7.6-pre

1.7.7

1.7.8

1.7.9

1.8.0

1.8.1-pre

1.8.10-pre

1.8.11

1.8.12

1.8.13

1.8.14

1.8.15

1.8.16-pre

1.8.17

1.8.18-pre

1.8.2-pre

1.8.3

1.8.4-pre

1.8.5

1.8.6-pre

1.8.7

1.8.8

1.8.9

1.9.0

1.9.1-pre

1.9.10

1.9.11

1.9.12

1.9.13

1.9.14

1.9.15

1.9.16

1.9.17

1.9.2

1.9.3

1.9.4

1.9.5

1.9.6

1.9.7

1.9.8

1.9.9

Mono Color

• 7d644c9086 update 1.8.2-pre Martin Robertz 2025-10-10 23:40:56 +02:00
• 00f71e266f update Martin Robertz 2025-10-10 23:13:49 +02:00
• 3af2c0bf53 Merge remote-tracking branch 'origin/update-handlers' into dev Martin Robertz 2025-10-10 23:12:58 +02:00
• 8000eb8074 Merge remote-tracking branch 'origin/info-pages' into dev Martin Robertz 2025-10-10 23:12:49 +02:00
• dd597cc80a Merge remote-tracking branch 'origin/ore-refactor-changes' into dev Martin Robertz 2025-10-10 23:12:34 +02:00
• c0dd8e2a06 Merge branch 'master' into info-pages koolkrafter5 2025-10-07 16:31:25 -04:00
• fd112eda2f Merge branch 'master' into update-handlers koolkrafter5 2025-10-07 16:30:23 -04:00
• 70319b86ba Merge branch 'master' into ore-refactor-changes Ethryan 2025-10-05 21:30:19 +02:00
• 91a3e07e12 update 1.8.1-pre Martin Robertz 2025-10-01 19:12:17 +02:00
• 3fa1d43501 Merge remote-tracking branch 'origin/update-handlers' into dev Martin Robertz 2025-10-01 19:11:43 +02:00
• 2757736c1c Merge remote-tracking branch 'origin/info-pages' into dev Martin Robertz 2025-10-01 19:11:39 +02:00
• 3b510a2c30 Merge remote-tracking branch 'origin/ore-refactor-changes' into dev Martin Robertz 2025-10-01 19:10:48 +02:00
• 8bb7b1dd9b update 1.8.0 Martin Robertz 2025-10-01 17:39:52 +02:00
• 1eeda9e82e Merge branch 'master' into ore-refactor-changes RecursivePineapple 2025-09-30 17:09:58 -04:00
• f6e054ccb0 update 1.7.51 Martin Robertz 2025-09-20 16:08:17 +02:00
• 7de1a553bc add Potion lang key (#108) ABKQPO 2025-09-19 08:07:51 +08:00
• ba7de9e090 update 1.7.50 Martin Robertz 2025-09-12 18:17:56 +02:00
• 291218c2aa Rename alchemicalwizardryBooks alchemicalwizardrybooks (#107) Eldrinn-Elantey 2025-09-11 20:33:19 +04:00
• 0534a90ef8 Spotless apply for branch update-handlers for #105 (#106) github-actions[bot]andGitHub GTNH Actions 2025-08-18 05:36:14 -04:00
• b6c10e52d2 This equates to this == o which is the same as super koolkrafter5 2025-08-18 05:30:17 -04:00
• 21f5f6857d Fix some issues in NEI handlers Let blood orbs be scrolled in the alchemy recipe handler and calicnator handler (needs open PR for NEI to be merged to let other stacks to be scrolled, but this compiles fine without it) Remove double-checked locking in NEIConfig::getBloodOrbs Cache more values in CachedReagentInfo Don't cache color value because it can change depending on implementation of .getColorX Fix state leaking in CachedReagentInfo Fix problem when finding recipes for empty belljars koolkrafter5 2025-08-18 05:29:53 -04:00
• 4baf6583c3 Update NEI for strict item identifier format to work koolkrafter5 2025-08-18 01:55:11 -04:00
• 3b72ab5138 Spotless koolkrafter5 2025-08-18 01:34:53 -04:00
• 11c363ec38 Pages for incense, sacrifices, rituals, and reagents koolkrafter5 2025-08-18 01:29:32 -04:00
• 6245fdbfd0 Register some NEI information pages with information with how to use the Blood Altar, Blood Runes, Blood Orbs, and some items necessary for progression. koolkrafter5 2025-08-17 08:19:23 -04:00
• 077af85b4b update 1.7.49 Dream Master 2025-08-16 18:49:01 +07:00
• efdfec3945 Change mining level of Bound Pickaxe, Axe and Shovel to 7 (#103) Kenzo Yonaha 2025-08-14 22:20:28 -03:00
• dac1da364d Swap to new ore natural API RecursivePineapple 2025-08-09 17:08:41 -04:00
• 6be1470620 update 1.7.48 Dream Master 2025-07-23 21:05:24 +07:00
• df7a14a323 Altar Blocks Config (#101) koolkrafter5 2025-07-23 09:56:22 -04:00
• 4a72a623bf update 1.7.47-pre Dream Master 2025-07-16 14:42:31 +07:00
• 0ed0cfccd8 Split configs for blocks used by each part of the Blood Altar's structure to allow for multiple blocks to be configured for each. Add some sensible default values for modded blocks. Missing blocks in config entries are simply ignored. koolkrafter5 2025-07-15 16:17:55 -04:00
• fd38fb1d55 Expand this to allow for multiple blocks for the same component. koolkrafter5 2025-07-15 09:30:05 -04:00
• b6400fca87 update 1.7.46 Maya 2025-07-02 16:23:55 -06:00
• 71e82d0b6e Refactor Teleposers (#100) koolkrafter5 2025-07-02 18:23:41 -04:00
• d696a1c97a Merge remote-tracking branch 'origin/teleposer' into dev 1.7.45-pre Martin Robertz 2025-07-01 12:05:21 +02:00
• bb488def54 Make them connect redstone koolkrafter5 2025-06-29 15:45:50 -04:00
• da31dfef7e update 1.7.44-pre Martin Robertz 2025-06-29 13:29:35 +02:00
• 084555d433 Merge branch 'master' into teleposer koolkrafter5 2025-06-28 19:59:15 -04:00
• 333fad3536 Refactor teleposers. Fix bug where the player entity duplicates when teleporting between dimensions, which caused same-dimension teleportation to make players teleport to the wrong place. Fix misplaced bounding box for searching for entities and simplified bounding box creation. Fix problem with the cooldown for teleporting between dimensions. Prevent players from teleposing to the Spirit World from Witchery because it softlocks the player until relogged. koolkrafter5 2025-06-28 19:29:10 -04:00
• 72ba898f39 update 1.7.43 Maya 2025-06-28 09:33:12 -06:00
• 9d18a56cc1 Backport WayofTime/BloodMagic@64660d2d28 (#99) ctrlaltmilk 2025-06-28 08:33:03 -07:00
• 7be69979d0 Merge remote-tracking branch 'ctrlaltmilk/comparator-backport' into dev 1.7.42-pre Martin Robertz 2025-06-28 14:32:51 +02:00
• 8dae648a0c Rework implementation ctrlaltmilk 2025-06-27 23:53:10 -07:00
• 8a4711b383 Refactor this whole file koolkrafter5 2025-06-27 23:57:14 -04:00
• e6c7496141 update 1.7.41-pre Martin Robertz 2025-06-27 17:27:45 +02:00
• 09a104314b Backport WayofTime/BloodMagic@64660d2d28 ctrlaltmilk 2025-06-25 18:17:58 -07:00
• 2c71765a1b update 1.7.40 Martin Robertz 2025-06-22 18:13:51 +02:00
• fc86b1449c Fix "Vis discount" Tooltip for Sanguine Armor (#98) koolkrafter5 2025-06-21 20:24:49 -04:00
• 548dc50ef5 update 1.7.39 Martin Robertz 2025-06-21 10:42:55 +02:00
• a7f4a16763 Fix ritual diviner lang (#97) koolkrafter5 2025-06-21 02:34:58 -04:00
• 503bb8f779 update 1.7.38 Martin Robertz 2025-06-21 00:59:41 +02:00
• 6acfde965a Re-encode it_IT.lang to UTF-8 (#96) Nikolay S. 2025-06-10 20:48:35 -05:00
• b7460516e8 Show Required Reagents for Fillers Replaced by Reagents (#93) koolkrafter5 2025-06-01 16:44:39 -04:00
• cf1b94ebdd Merge remote-tracking branch 'origin/meteor-handler-reagents' into dev 1.7.37-pre Martin Robertz 2025-06-01 13:28:46 +02:00
• 782096f8eb pdate 1.7.36 Martin Robertz 2025-06-01 13:28:13 +02:00
• 4f0f2afc37 Merge branch 'master' into meteor-handler-reagents koolkrafter5 2025-06-01 04:59:19 -04:00
• b79692d27f Show capacity of Blood Orbs in the tooltip. (#95) Abdiel Kavash 2025-06-01 02:58:34 -06:00
• 976e959f4c Spotless koolkrafter5 2025-05-31 16:24:49 -04:00
• 79471d9a6b Show required reagents for fillers replaced by reagents koolkrafter5 2025-05-31 16:17:17 -04:00
• 73ae391e8a update 1.7.35 Maya 2025-05-30 22:06:06 -06:00
• 1f5a267be0 Texture Improvements (#92) koolkrafter5andMaya 2025-05-31 00:05:56 -04:00
• 46de8cb05c Registry Ordering (#91) koolkrafter5andMaya 2025-05-31 00:02:49 -04:00
• 8799a637f8 Lang Cleanup (#90) koolkrafter5 2025-05-30 23:56:08 -04:00
• 7e9c008713 Merge remote-tracking branch 'origin/texture' into dev 1.7.34-pre Martin Robertz 2025-05-30 21:29:38 +02:00
• 45888e30fe Use improved switch blocks and remove extra textures not relevant to the blocks. koolkrafter5 2025-05-30 15:13:22 -04:00
• 5b42253d09 update 1.7.33-pre Martin Robertz 2025-05-30 20:36:24 +02:00
• 9ea9a2cffb Merge remote-tracking branch 'origin/registry-ordering' into dev Martin Robertz 2025-05-30 20:35:47 +02:00
• 0b7e66c872 Add a texture for the Schematic Saver, a dev utility block used to make the structure files for the Convocation of the Damned. It's based on the large bloodstone brick texture because it uses them to define the bounds of the structure. koolkrafter5 2025-05-30 14:11:35 -04:00
• b5c4f87943 Add missing yellow pixel to bound pick koolkrafter5 2025-05-30 13:34:36 -04:00
• 237972136d Sort item registration into a more sensible order for display in NEI. koolkrafter5 2025-05-30 12:38:23 -04:00
• 49513bded7 Sort block registration into a more sensible order for display in NEI. koolkrafter5 2025-05-30 10:46:34 -04:00
• 76526aa85d Formatting koolkrafter5 2025-05-30 10:09:39 -04:00
• 5f91f7c008 Remove "'s" from Magician's and Archmage's blood orbs to match the other orbs (this is also how BM for versions like 1.12 has it) koolkrafter5 2025-05-30 10:04:38 -04:00
• 3272a06671 Fix typos, mark Fluid Sigil and Sigil of the Assassin as unimplemented, clarify some achievements koolkrafter5 2025-05-30 09:54:34 -04:00
• 6ace1a8bba Move "Armour" spelling to British English lang files koolkrafter5 2025-05-30 08:59:47 -04:00
• 485e462a83 Allow the Orb of Armok to work from within a Blood Altar. (#89) 1.7.32 Abdiel Kavash 2025-05-27 13:53:44 -06:00
• 47f5e1e594 Update Readme (#88) koolkrafter5 2025-05-26 11:15:26 -04:00
• 1546426f30 update 1.7.31 Maya 2025-05-25 18:38:52 -06:00
• 4acfe14b78 Orchestra of the Phantom Hands Improvements (#85) koolkrafter5andMaya 2025-05-25 20:38:01 -04:00
• 22d7519ecb Merge branch 'phantom-hands' into dev 1.7.30-pre Maya 2025-05-25 12:59:21 -06:00
• 86d7ea0370 update 1.7.29 Maya 2025-05-25 12:58:42 -06:00
• 6277156c88 Merge branch 'master' into phantom-hands Maya 2025-05-25 12:54:09 -06:00
• bbf0e2aeb2 Inscription Tools Refactor (#86) koolkrafter5andMaya 2025-05-25 14:53:25 -04:00
• 22f1bd3846 Add an Alchemic Calcinator handler for NEI (#87) koolkrafter5 2025-05-25 14:50:55 -04:00
• 8695af5d74 update 1.7.28-pre Martin Robertz 2025-05-25 15:00:06 +02:00
• 30a3aed80d Merge remote-tracking branch 'origin/calcinator' into dev Martin Robertz 2025-05-25 14:59:08 +02:00
• 5bbfe2a478 Rename variable for clarity koolkrafter5 2025-05-24 21:03:48 -04:00
• f7c4f48396 update 1.7.27-pre Dream Master 2025-05-23 11:13:20 +02:00
• ee94755d48 Merge remote-tracking branch 'origin/calcinator' into dev Dream Master 2025-05-23 11:12:08 +02:00
• ddb40cf18d Merge remote-tracking branch 'origin/inscription-tools' into dev Dream Master 2025-05-23 11:12:04 +02:00
• 9562bc6e13 And this koolkrafter5 2025-05-21 04:30:40 -04:00
• 2d145c4c98 Remove this koolkrafter5 2025-05-21 04:19:33 -04:00
• 718b34ae4c Add a calcinator handler for NEI. koolkrafter5 2025-04-28 15:54:11 -04:00
• 4cb550b34c Fix name of param koolkrafter5 2025-05-21 01:18:36 -04:00
• c5c5c4aef8 Add a fallback constructor koolkrafter5 2025-05-21 01:13:29 -04:00
• 71222e2c13 Simplify ritual stone scribing logic. Make it so using a scribe tool on a ritual stone that already has the same element does not consume durability. koolkrafter5 2025-05-21 00:59:13 -04:00
• 81fed8f46d Make the scribe tools actually consume LP when used. Refactor scribe tools to not need separate classes for each one. koolkrafter5 2025-05-21 00:58:04 -04:00
• 60ab0504a9 Make the scribe tools actually consume LP when used. koolkrafter5 2025-05-21 00:06:29 -04:00
• 24d6f382ba update 1.7.26-pre Martin Robertz 2025-05-18 11:40:19 +02:00