Commit Graph

Select branches

Hide Pull Requests

Ranzu/Dashboard

ah-OOG-ah/patchEnch

botania-null

efr-cocoon-of-caprice

feature/mana-tooltips

feature/schematics-refactor

gourmaryllisGTFood

master

milk-modded-cows

release/2.9.x

update-lexica-wiki-links

visibility-controls

#1

#10

#100

#101

#103

#104

#105

#106

#107

#109

#11

#110

#112

#113

#113/merge

#116

#117

#119

#12

#120

#123

#123/merge

#124

#125

#126

#127

#128

#128/merge

#129

#13

#130

#131

#132

#133

#136

#137

#138

#138/merge

#14

#140

#142

#142/merge

#143

#144

#146

#147

#149

#15

#150

#151

#152

#154

#154/merge

#155

#156

#157

#158

#159

#16

#160

#161

#161/merge

#162

#163

#164

#165

#165/merge

#166

#166/merge

#167

#167/merge

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#39

#4

#41

#42

#43

#44

#45

#46

#47

#49

#5

#51

#52

#53

#54

#55

#57

#6

#60

#61

#62

#64

#65

#66

#67

#68

#7

#75

#76

#78

#8

#81

#83

#84

#86

#87

#88

#89

#9

#91

#92

#93

#94

#95

#97

#98

#99

1.10.0-GTNH

1.10.1-GTNH

1.10.10-GTNH

1.10.11-GTNH

1.10.12-GTNH

1.10.13-GTNH

1.10.2-GTNH

1.10.3-GTNH

1.10.4-GTNH

1.10.5-GTNH

1.10.6-GTNH

1.10.7-GTNH

1.10.8-GTNH-pre

1.10.9-GTNH

1.11.0-GTNH

1.11.1-GTNH

1.11.2-GTNH-pre

1.11.3-GTNH

1.11.4-GTNH

1.11.5-GTNH

1.11.6-GTNH

1.11.7-GTNH

1.12.1-GTNH

1.12.10-GTNH

1.12.11-GTNH-pre

1.12.12-GTNH

1.12.13-GTNH-pre

1.12.14-GTNH-pre

1.12.15-GTNH-pre

1.12.16-GTNH

1.12.17-GTNH-pre

1.12.18-GTNH

1.12.19-GTNH-pre

1.12.2-GTNH

1.12.20-GTNH

1.12.21-GTNH

1.12.22-GTNH

1.12.23-GTNH

1.12.24-GTNH

1.12.25-GTNH

1.12.26-GTNH

1.12.27-GTNH

1.12.28-GTNH

1.12.3-GTNH

1.12.4-GTNH-pre

1.12.5-GTNH

1.12.6-GTNH

1.12.7-GTNH-pre

1.12.8-GTNH

1.12.9-GTNH-pre

1.13.0-GTNH

1.13.1-GTNH

1.13.10-GTNH

1.13.11-GTNH-pre

1.13.12-GTNH

1.13.13-GTNH-pre

1.13.14-GTNH

1.13.15-GTNH

1.13.16-GTNH

1.13.17-GTNH

1.13.18-GTNH-pre

1.13.19-GTNH

1.13.2-GTNH-pre

1.13.20-GTNH-pre

1.13.21-GTNH

1.13.22-GTNH-pre

1.13.23-GTNH-pre

1.13.24-GTNH-pre

1.13.25-GTNH

1.13.26-GTNH

1.13.27-GTNH

1.13.28-GTNH

1.13.29-GTNH

1.13.3-GTNH

1.13.30-GTNH

1.13.31-GTNH

1.13.32-GTNH

1.13.33-GTNH

1.13.34-GTNH

1.13.35-GTNH

1.13.36-GTNH

1.13.37-GTNH

1.13.38-GTNH

1.13.39-GTNH

1.13.4-GTNH

1.13.40-GTNH

1.13.41-GTNH

1.13.42-GTNH

1.13.43-GTNH

1.13.5-GTNH-pre

1.13.6-GTNH

1.13.7-GTNH-pre

1.13.8-GTNH

1.13.9-GTNH-pre

1.14.0-GTNH

1.14.1-GTNH

1.9.0-GTNH

1.9.1-GTNH

1.9.10-GTNH

1.9.11-GTNH

1.9.11-GTNH-pre

1.9.12-GTNH

1.9.13-GTNH

1.9.14-GTNH

1.9.15-GTNH

1.9.16-GTNH

1.9.17-GTNH

1.9.18-GTNH-pre

1.9.19-GTNH

1.9.2-GTNH

1.9.20-GTNH-pre

1.9.21-GTNH

1.9.22-GTNH

1.9.23-GTNH

1.9.24-GTNH

1.9.3-GTNH

1.9.4-GTNH

1.9.5-GTNH

1.9.6-GTNH

1.9.7-GTNH

1.9.8-GTNH

1.9.9-GTNH

V0.4-alpha

extStateDebug

jenkins-testtag

jenkins-testtag-2

r1.8-299

r1.8-300-ALPHA

r1.8-301

r1.8-302

r1.8-303

r1.8-304

r1.8-305

r1.8-306

r1.8-307

r1.8-308

r1.8-309

r1.8-310

r1.8-311

r1.8-312

r1.8-313

r1.8-314

r1.8-315

r1.8-316

r1.8-317

r1.8-318

r1.8-319

r1.8-320

r1.8-321

release-1.16-388

release-1.16-389

release-1.16-390

release-1.16-391

release-1.16-392

release-1.16-393

release-1.16-394

release-1.16-395

v0.1-alpha

v0.2-alpha

v0.3-alpha

v0.3.1-alpha

v0.3.2-alpha

v0.3.3-alpha

v0.4.1-alpha

v0.5-beta

v0.5.1-beta

v0.5.2-beta

v0.5.2.1-beta

v0.5.2.2-beta

v0.5.3-beta

v0.5.4-beta

v0.5.4.1-beta

v0.6-beta

v0.6.1-beta

v0.6.2-beta

v0.6.3-beta

v0.6.4-beta

v0.6.4.1-beta

v0.6.4.2-beta

Mono Color

• f49e3bdb37 Update contributors.properties Vasco Lavos 2020-03-09 10:30:09 +00:00
• 6d7e5037d9 Update contributing info, add PMD/Spotless to github actions builds Hubry 2020-03-07 23:07:41 +01:00
• 2152473edb Run Spotless, cleanup unused imports, add braces to one line for/if/etc. Hubry 2020-03-07 22:39:15 +01:00
• 21d9d95611 Set up Spotless and PMD for some basic formatting Hubry 2020-03-07 22:38:28 +01:00
• a534f041f5 Move spreader magic-numbers into the enum (#3200) Al Winfy 2020-03-07 12:38:36 -06:00
• 5a6fc49079 Update contributors.properties Vasco Lavos 2020-03-06 18:17:18 +00:00
• 807c7174ed Update contributors.properties Vasco Lavos 2020-03-05 17:43:43 +00:00
• f91dd3873f Merge 1.14 Vincent Lee 2020-03-03 10:34:38 -06:00
• 0cc7ab725e Remove extraneous keys, add N*merical Mana entry in web-lexicon (#3191) Al Winfy 2020-03-02 21:36:26 -06:00
• d3959c1d25 Fix pixie attribute registration again Vincent Lee 2020-03-02 18:11:03 -06:00
• c40d4aa3ee Migrate halo render fully to renderlayers but it still flickers Vincent Lee 2020-03-02 16:16:21 -06:00
• ea5265a4e5 Fix an entropinnyum oversight Vincent Lee 2020-03-02 11:19:51 -06:00
• 7b2b8a69b0 Run keepivy handler later so it receives curio drops as well. Closes #3196 Vincent Lee 2020-03-01 22:32:51 -06:00
• 99da7678d9 Update contributors.properties Vasco Lavos 2020-03-01 19:50:21 +00:00
• 5ee1f12082 Update contributors.properties Vasco Lavos 2020-02-29 16:24:00 +00:00
• 06453e84e6 Re-add missing floating endoflame recipe, closes #3192 Hubry 2020-02-29 00:11:05 +01:00
• 4b8be63622 Fix bifrost pane properties, closes #3189 Hubry 2020-02-28 12:05:35 +01:00
• 60f2727e15 Update contributors.properties Vasco Lavos 2020-02-27 17:22:55 +00:00
• d3dfa2763c Fix recipe mistake missed when checking the generated recipe diff Hubry 2020-02-27 15:29:05 +01:00
• 1a303f8bd6 bump curios, dep-specs Vincent Lee 2020-02-26 19:43:11 -06:00
• c14aa26929 Move exchange rod back to matching blocks instead of states Vincent Lee 2020-02-26 19:30:05 -06:00
• a19231b451 More api Vincent Lee 2020-02-26 19:19:12 -06:00
• 926b8d864a More API cleanup (notably, remove TileSignature) Vincent Lee 2020-02-26 19:10:50 -06:00
• 8d54c9a8cb Start API cleanup Vincent Lee 2020-02-26 18:49:24 -06:00
• 76fa4cba29 Bound tile renderer renders all parts of a complex voxelshape instead of just the border Vincent Lee 2020-02-26 18:35:33 -06:00
• f688cd57de Fix babylon weapons not rendering, but the transforms are still off Vincent Lee 2020-02-26 14:15:01 -06:00
• 0e0233a5a6 Fix index render Vincent Lee 2020-02-26 13:43:41 -06:00
• dfa9e66efc Cleanups in ModBlocks Vincent Lee 2020-02-26 10:55:38 -06:00
• db3d72c726 Update contributors.properties Vasco Lavos 2020-02-26 16:52:49 +00:00
• d70f7e2754 Query spreader render layer from the blockstate Vincent Lee 2020-02-26 10:42:48 -06:00
• 5109fb06d0 Clean up isXSpreader methods on tilespreader Vincent Lee 2020-02-26 10:40:11 -06:00
• 049936bc30 Complete migration of spreaders to baked models Vincent Lee 2020-02-26 10:27:53 -06:00
• fcb301a97f Rename spreader textures Vincent Lee 2020-02-26 09:59:52 -06:00
• 944410603c WIP: Begin transitioning mana spreader to use baked models Vincent Lee 2020-02-26 00:37:14 -06:00
• 7c9782a5c9 Fix typo in layer name Vincent Lee 2020-02-25 21:18:16 -06:00
• ab8713d521 Clean up RenderHelper blit method Vincent Lee 2020-02-25 21:17:29 -06:00
• 3de6b06679 Disable quad sorting on our GL_TRIANGLES renders, also fix culling not being disabled Vincent Lee 2020-02-25 20:48:49 -06:00
• 114a684578 Don't reduce stack size when re-adding previous recipe in creative. (#3187) Eutro 2020-02-25 21:34:34 +00:00
• 6f02a65c60 Dispenser Wand Functionality for Sneak-Right Clicking. (#3165) Eutro 2020-02-25 18:42:32 +00:00
• d365273ead Fix fabulous pool item render, move TE render color calc from awt Hubry 2020-02-25 00:17:12 +01:00
• c65062dd53 Delete unneeded cross_tinted now that special flower coloring is gone Vincent Lee 2020-02-24 14:53:36 -06:00
• cc73e72fbc Dyeing fabulous pools now multiplies the color instead of ignoring dye Hubry 2020-02-24 20:24:19 +01:00
• a9496b98ae RIP remains of dyeing special flowers, feature no one heard of Hubry 2020-02-24 19:46:57 +01:00
• 76f116dc90 Check if models were registered to avoid misleading NPE crashes Hubry 2020-02-24 19:32:57 +01:00
• 4bb46ef9ec Make all tints index checked Hubry 2020-02-24 19:30:45 +01:00
• 79ccf912ff Update bottle textures to 1.14+ (#3186) Al Winfy 2020-02-23 23:00:41 -06:00
• 380a57d1d5 hotfix to allow force relays to store their bound blocks on other dimensions (#3182) Tiago Carvalho 2020-02-24 03:58:59 +00:00
• a70c3ad12e Clean up typos, update info in en_us Lexica (#3185) Al Winfy 2020-02-23 21:50:17 -06:00
• 2a0f8d42d3 Fix banner pattern lang on other languages Hubry 2020-02-23 00:58:37 +01:00
• 6d95ea4375 Remove noloc entry as it's unused Vincent Lee 2020-02-22 15:05:12 -06:00
• 263b74faf6 Name for new loki advancement Vincent Lee 2020-02-22 15:02:59 -06:00
• e49f51a3e1 Fix at least one known instance of #3140 Vincent Lee 2020-02-22 10:12:34 -06:00
• a35da8e163 Switch a bunch of world.getblockstate calls in te's to self getblockstate Vincent Lee 2020-02-22 09:29:07 -06:00
• 30472c4d80 Merge 1.14 Vincent Lee 2020-02-20 23:00:21 -06:00
• 612d8f886e Migrate piston relay to proper per-world WSD Vincent Lee 2020-02-20 22:59:12 -06:00
• fe0bf9407b Fix pixie handler crashing when entering alternate dims Vincent Lee 2020-02-20 22:58:58 -06:00
• 4079187457 Check force relay direction using the block 36 TE, closes #3181 Vincent Lee 2020-02-20 22:35:19 -06:00
• 8e99f81335 Fix a lot of animations jittering when the game is paused. Closes #3038 Vincent Lee 2020-02-20 22:07:37 -06:00
• 0ac2062431 Fix bound block renders being faint and not depth ignoring Vincent Lee 2020-02-20 21:44:33 -06:00
• 1a4b5ed286 Fix compile and rerun data Vincent Lee 2020-02-20 21:03:28 -06:00
• a6cf5653dc Merge 1.14 Vincent Lee 2020-02-20 21:00:55 -06:00
• 1e280976c4 Some color fixes Vincent Lee 2020-02-20 21:00:12 -06:00
• c0eed8a8e9 Remove unneeded override as it's covered by the one above it now Vincent Lee 2020-02-20 14:10:50 -06:00
• 0440ada3dd More lang file cleaning Vincent Lee 2020-02-20 11:36:16 -06:00
• 52abb968e4 Clean out some dead lang entries Vincent Lee 2020-02-20 11:23:05 -06:00
• 3e77b0bee0 Fix non-english advancement names being...broken...since...1.12... Vincent Lee 2020-02-20 00:45:55 -06:00
• 6346da980e Advancement: That's Why I Baked Bread Vincent Lee 2020-02-20 00:13:12 -06:00
• b3ac525569 Loki ring advancement, no title yet Vincent Lee 2020-02-19 23:39:31 -06:00
• 42193cc127 Azulejo creation now takes any blue dye Vincent Lee 2020-02-18 19:40:07 -06:00
• 337f9fe322 Add workaround crafting recipe for Botania banner patterns, rerun data Hubry 2020-02-18 17:57:33 +01:00
• 99df65bb45 Change the seed source for plentiful mantle rod, fixes #3178 Hubry 2020-02-17 19:10:31 +01:00
• 0e73ef6f08 Minor patchouli corrections, remove old TC recipes/integration pages Hubry 2020-02-17 18:40:25 +01:00
• 6fe73cb39f Generate recipe and advancement jsons, remove old recipes Hubry 2020-02-17 18:38:22 +01:00
• 9cc6eb9870 Create recipe generator for existing json recipes Hubry 2020-02-17 18:34:20 +01:00
• c19c4ecbb3 Generate floating flower item models and fix their in-hand transforms Vincent Lee 2020-02-17 11:05:34 -06:00
• df11e72db3 Fix compile error, make ColorHelper less awful Vincent Lee 2020-02-16 21:45:18 -06:00
• e5c5a37f27 Merge 1.14 Vincent Lee 2020-02-16 21:26:51 -06:00
• 59e0c6c987 Narrator: it wasn't released Vincent Lee 2020-02-16 21:21:36 -06:00
• 9253a541c4 Replace bauble box slots with a player render because what else would i put there Vincent Lee 2020-02-16 21:20:11 -06:00
• eabdbd910a Update contributors.properties Vasco Lavos 2020-02-16 14:16:03 +00:00
• 3ccbef5c16 Loki ring now highlights center pos in bold even when not building a new list of cursors Vincent Lee 2020-02-15 19:57:40 -06:00
• 162519dba3 Fix loki ring being bork, should now match 1.7 behavior exactly. Closes #3179 Vincent Lee 2020-02-15 19:37:52 -06:00
• 13668c5448 Modernize ToolCommon.raytraceFromEntity Vincent Lee 2020-02-15 19:04:47 -06:00
• dde52533fd Corporea feedback for stack requests now uses the fancy component with hoverevent Vincent Lee 2020-02-15 01:15:46 -06:00
• f4886b8627 new Style.setColor -> applyTextStyle Vincent Lee 2020-02-15 01:15:06 -06:00
• d434a1c915 Eliminate awful logic duplication in ManaItemHandler Vincent Lee 2020-02-15 01:12:11 -06:00
• 918372c404 Convert Pixie Spawn Chance into an attribute Vincent Lee 2020-02-15 00:39:25 -06:00
• 622fd8a3f6 Remove old lexicon method Vincent Lee 2020-02-14 23:59:33 -06:00
• 477e350757 Remove legacy meta method Vincent Lee 2020-02-14 23:54:25 -06:00
• 669568f426 Move inner helper method of manaprof armor to the interface itself Vincent Lee 2020-02-14 23:53:38 -06:00
• 92c6708a68 Replace sortable tool tooltypes with the ones that have been in forge for... a while Vincent Lee 2020-02-14 23:50:45 -06:00
• 0a558f72bd Some cleanups Vincent Lee 2020-02-14 22:52:38 -06:00
• 85a7c986cf Restore lexicon first person render, mostly Vincent Lee 2020-02-14 22:48:53 -06:00
• 05fe2c195c Bump patchouli and forge, fix floating flower in world render Vincent Lee 2020-02-14 20:56:28 -06:00
• 9c23ff9257 Use forge's getHighlightTip for wand instead of rendering mode line ourselves Vincent Lee 2020-02-14 20:24:02 -06:00
• 954020392f Update contributors.properties Vasco Lavos 2020-02-14 17:00:09 +00:00
• b373df600c Update contributors.properties Vasco Lavos 2020-02-13 22:56:55 +00:00
• 674c454030 Update contributors.properties Vasco Lavos 2020-02-11 17:29:09 +00:00
• 065d189c5e Mark cocoon-spawned entities as un-despawnable Vincent Lee 2020-02-10 13:17:05 -06:00
• bb68017141 Fix missing nullcheck in platform. Closes #3168 Vincent Lee 2020-02-07 21:10:43 -06:00