Commit Graph

Select branches

Hide Pull Requests

endest-pearl-block-permission

faster-loading

master

translator

#1

#1/merge

#10

#11

#12

#13

#14

#15

#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

#78/merge

#79

#8

#80

#81

#82

#83

#84

#85

#86

#87

#88

#88/merge

#9

1.100

1.12

1.13

1.14

1.15

1.16

1.17

1.18

1.19

1.2.2

1.2.3

1.2.4

1.2.5

1.20

1.21

1.22

1.23

1.24

1.25

1.26

1.27

1.28

1.29

1.30

1.31

1.32

1.33

1.34

1.35

1.36

1.37

1.38

1.39

1.40-pre

1.41

1.42

1.43

1.44-pre

1.45

1.46

1.47

1.48

1.49

1.50

1.51

1.52

1.53

1.54

1.55

1.56

1.57

1.58

1.59

1.60-pre

1.61

1.62

1.63

1.64-pre

1.65-pre

1.66

1.67

1.68

1.69

1.70

1.71

1.72

1.73

1.74

1.75

1.76

1.77

1.78

1.79-pre

1.80-pre

1.81-pre

1.82-pre

1.83

1.84-pre

1.85

1.86-pre

1.87-pre

1.88-pre

1.89

1.90-pre

1.91

1.92

1.93

1.94

1.95

1.96

1.97

1.98

1.99

Mono Color

• 6390207740 Merge pull request #45 from BluSunrize/master SpitefulFox 2015-09-24 12:14:55 -07:00
• 140af8026b Added the Popetato BluSunrize 2015-09-24 18:35:05 +02:00
• 2ed73fed75 Merge pull request #43 from BluSunrize/master SpitefulFox 2015-09-22 08:46:26 -07:00
• a134773cad Removed stacktrace from render. We wouldn't wanna spam the log, would we? BluSunrize 2015-09-22 17:35:05 +02:00
• 2ebfa52a16 Reenabled TCon compat BluSunrize 2015-09-22 17:32:26 +02:00
• 0497b8cea7 Added the Infinite Foxtato BluSunrize 2015-09-22 17:31:05 +02:00
• e78dd080e2 Compressor recognizes quantity recipes Jeremy Diamond 2015-09-16 18:34:56 -07:00
• 4f763cac6e Thanks for all the null, Mojang Jeremy Diamond 2015-09-16 18:34:31 -07:00
• 1ce374d441 Don't mine what you eat Jeremy Diamond 2015-09-16 18:34:08 -07:00
• 5b21405d68 Alfheim Ruins Everything Jeremy Diamond 2015-09-16 18:33:42 -07:00
• ac56547c63 Merge pull request #35 from mrammy/master SpitefulFox 2015-09-12 21:49:07 -07:00
• 6206f965ea Fix oredictionary registrations that were previously ignored as invalid Mary 2015-09-12 21:19:21 -07:00
• f13fe03cfe Imagine Dragons Jeremy Diamond 2015-09-12 20:39:07 -07:00
• 58ff2ac6d2 Shovel Tweak and Invincibility Tweak Jeremy Diamond 2015-09-12 18:53:02 -07:00
• e5108f8d44 Compressor Fix Jeremy Diamond 2015-09-12 18:52:13 -07:00
• d83c3d0cb2 Update todo.txt SpitefulFox 2015-09-12 01:23:41 -07:00
• bef1ebf2b2 Update todo.txt SpitefulFox 2015-09-12 00:28:23 -07:00
• 8997655d2d Stuff and Things Jeremy Diamond 2015-09-11 23:45:12 -07:00
• f118481c35 Update todo.txt SpitefulFox 2015-09-11 01:09:42 -07:00
• 30f40eb38b Ore Dictionary Stuff Jeremy Diamond 2015-09-11 00:43:38 -07:00
• ce53481cbb Infinity Shovel works! Jeremy Diamond 2015-09-11 00:43:24 -07:00
• 8055110397 What is this? I don't even Jeremy Diamond 2015-09-10 09:34:06 -07:00
• c233a11b6d Creativity! Jeremy Diamond 2015-09-09 21:57:57 -07:00
• 198fe8b728 Minor Tweaks Jeremy Diamond 2015-09-06 11:02:33 -07:00
• 6ebd1305af Made a flower as a punchline... NYI functionality. Alex Spinks 2015-09-06 17:29:20 +01:00
• b939e9cbaf Revert "Update Botania API. Use ForgeGradle for some dependencies, update others. Actually runs in dev environment now. Add armor set bonus for mana reduction while wearing infinity armor." Jeremy Diamond 2015-09-05 01:17:52 -07:00
• 293939083a Revert "Fix setupDecomWorkspace not working because the CoFH access tranformer was in the wrong spot" Jeremy Diamond 2015-09-05 01:16:45 -07:00
• 0842d46153 Merge pull request #29 from mrammy/master SpitefulFox 2015-09-03 11:00:30 -07:00
• 8c4b1f7a7e Fix setupDecomWorkspace not working because the CoFH access tranformer was in the wrong spot Mary 2015-09-03 10:52:37 -07:00
• 7e456560ab Merge pull request #28 from mrammy/master SpitefulFox 2015-09-01 23:38:27 -07:00
• f4eb321fc2 Update Botania API. Use ForgeGradle for some dependencies, update others. Actually runs in dev environment now. Add armor set bonus for mana reduction while wearing infinity armor. Mary 2015-09-01 10:12:21 -07:00
• df4e6e2919 Ded Bugs Jeremy Diamond 2015-08-27 13:30:20 -07:00
• f1ae638bfd Ruin things... but only THAT bit. Alex Spinks 2015-08-27 21:08:04 +01:00
• ec09006587 Do Not Eat Jeremy Diamond 2015-08-26 00:17:08 -07:00
• 2940108a8e What is this? Alex Spinks 2015-08-25 22:26:18 +01:00
• 0129020c16 The start of structure. Alex Spinks 2015-08-23 20:21:49 +01:00
• 280ae8e30b Dead things, teleports, smoothing, oh my! Alex Spinks 2015-08-22 22:44:59 +01:00
• 947685bb5d Whatever Jeremy Diamond 2015-08-21 22:05:02 -07:00
• ce747d8603 Scenery. Alex Spinks 2015-08-22 00:36:12 +01:00
• a9e1b2fe74 Beeeeeees Jeremy Diamond 2015-08-21 15:06:24 -07:00
• 3c37788894 Update todo.txt SpitefulFox 2015-08-20 22:58:45 -07:00
• 99df7f0fb7 Fancier giant halo. Alex Spinks 2015-08-20 21:40:57 +01:00
• eeba3cf808 Mmmm you can FEEL the WARMTH. Also burning. Alex Spinks 2015-08-20 21:07:02 +01:00
• 6642a01cfd Buckle up, kids! WE'RE GOING TO ALFHEIM. Alex Spinks 2015-08-20 02:15:12 +01:00
• 283814b731 Handy info and that infinity block recipe at last. Alex Spinks 2015-08-18 20:53:14 +01:00
• d6824d2632 Damnit Spiteful, Y U FIX what I was fixing? D: Alex Spinks 2015-08-18 16:00:34 +01:00
• 8ea32092d9 Stupid client side methods... fixes #20 Alex Spinks 2015-08-18 15:57:38 +01:00
• 3716a65f8d Fabulous Infinitato Jeremy Diamond 2015-08-18 04:18:11 -07:00
• 1b41b2d13d LOLOLOLMOJANG LAAAAWL Jeremy Diamond 2015-08-17 23:43:37 -07:00
• 6bebc6a195 Unbreakable Jeremy Diamond 2015-08-17 23:32:40 -07:00
• f608b28027 Minor Tweaks, Compressor improvements Jeremy Diamond 2015-08-16 16:30:44 -07:00
• 9d14de583e Balance! Jeremy Diamond 2015-08-15 01:17:06 -07:00
• 37c92016a7 LOLKAMI Jeremy Diamond 2015-08-15 01:16:54 -07:00
• c4fb8bf613 Godwin's Law Violation Jeremy Diamond 2015-08-15 01:16:15 -07:00
• d597d629b1 Morv-In-A-Box! Alex Spinks 2015-08-14 21:07:54 +01:00
• 513516d7a6 Merge pull request #16 from CandiceJoy/patch-1 SpitefulFox 2015-08-13 17:57:47 -07:00
• e5a8a6bfe7 Update ToolHelper.java Candice 2015-08-13 19:51:19 -05:00
• ad0814c03f Bow pretties, cosmic improvements, SHOVEL Alex Spinks 2015-08-13 22:55:54 +01:00
• fb7992270e Squishy Jeremy Diamond 2015-08-11 04:33:57 -07:00
• cda8ce6b17 Configs Jeremy Diamond 2015-08-09 16:52:15 -07:00
• affd2c9d55 Server Safe! Jeremy Diamond 2015-08-09 03:06:24 -07:00
• e6b5cfa20c Borken Infinity Shovel and Axe Jeremy Diamond 2015-08-09 03:06:03 -07:00
• 6bdcd8cf73 TiCon Tweaking Jeremy Diamond 2015-08-09 03:05:22 -07:00
• 09a25ad711 No ugly enchant overlays Jeremy Diamond 2015-08-08 00:21:37 -07:00
• 11b336c112 Longbow of the Heavens, first pass Alex Spinks 2015-08-08 00:56:39 +01:00
• b21e46456e Restore the proper todo after conflict beatdown Alex Spinks 2015-08-06 22:01:55 +01:00
• 2560663dff Attempting fix of a dumb conflict. Alex Spinks 2015-08-06 21:32:44 +01:00
• 4dc827f357 TiCon: DONE. Also updated todo list. Alex Spinks 2015-08-06 21:23:20 +01:00
• 52bce12f4a Update todo.txt SpitefulFox 2015-08-06 12:22:58 -07:00
• 1d8e0570e4 Update todo.txt SpitefulFox 2015-08-06 12:21:59 -07:00
• 98010eef23 Dire table now stores items Jeremy Diamond 2015-08-06 03:22:33 -07:00
• 3069972354 Woops. Forgot a bit. Alex Spinks 2015-08-06 04:31:02 +01:00
• df49d4fd7a Teeny-tiny text update Alex Spinks 2015-08-06 04:29:00 +01:00
• 8d8544a15b Fixed invalid fractured ores, added ticon effects. Alex Spinks 2015-08-06 04:11:29 +01:00
• 4add7a28e6 Infinity part recipes, recipe cleanup Alex Spinks 2015-08-05 21:24:02 +01:00
• f87c37a4c7 Server Friendly Jeremy Diamond 2015-08-05 10:37:49 -07:00
• 38467948a3 This should compile! :D Jeremy Diamond 2015-08-04 21:46:48 -07:00
• df94126ea8 Funky stuff for infinity metal tonk Alex Spinks 2015-08-05 05:07:45 +01:00
• a2ae147343 To Infinity! And... slightly sideways! Alex Spinks 2015-08-04 21:05:41 +01:00
• 8da392e04a A whole pile of WIP TiCon integration stuff Alex Spinks 2015-08-04 05:16:20 +01:00
• 915f3056be Better balls, fancier Infinity block, update todo Alex Spinks 2015-08-03 21:19:20 +01:00
• 97f87ce024 BALLS OF... well, everything really. Alex Spinks 2015-08-03 05:36:21 +01:00
• 2ce89feeab It bops the ore with the pick or it gets the hose again. Alex Spinks 2015-08-02 18:26:16 +01:00
• a27b6578df Good riddance to Fractured Cutting Board! Alex Spinks 2015-08-02 01:37:06 +01:00
• bbf04e5542 Smash up ores, get broken bits. Really broken! Alex Spinks 2015-08-01 02:33:58 +01:00
• 72b260e758 Potatoes gonna potate. Also BELIEVE. Alex Spinks 2015-07-31 05:02:10 +01:00
• 75376ea2a6 Update todo.txt SpitefulFox 2015-07-30 20:23:04 -07:00
• 7b7eaed652 Immortal items, better potatoes, SANIC speed, oh my! Alex Spinks 2015-07-30 05:42:21 +01:00
• 01a8fbf06f Akashic Records fix Jeremy Diamond 2015-07-29 17:06:46 -07:00
• 78e9a65ff2 EVERYTHING Jeremy Diamond 2015-07-29 13:42:34 -07:00
• 774852d26e DO IT! Jeremy Diamond 2015-07-29 01:33:18 -07:00
• c61d4abc0b Spood Beets. Alex Spinks 2015-07-29 05:11:43 +01:00
• 590618087d Fancy armour, sneaky armour. Alex Spinks 2015-07-29 01:05:27 +01:00
• 574a524953 Calamari, Pneumatics, and Air Hammers Jeremy Diamond 2015-07-28 01:55:58 -07:00
• a41ed9366a Checklist! Jeremy Diamond 2015-07-27 22:10:21 -07:00
• 3ef5cb0eca Renders on every. damn. biped. there is! Aww yeah. Alex Spinks 2015-07-28 05:32:47 +01:00
• d4c217aaaa Back that thaum truck up there Jeremy Diamond 2015-07-27 17:10:50 -07:00
• 50d3ba4636 Smashing, Thaumcrafting, and Fixing Jeremy Diamond 2015-07-27 16:56:52 -07:00
• 9a6b46add2 Optional being stupid Jeremy Diamond 2015-07-27 13:46:24 -07:00
• 802e18e489 Thaumic Smaaaaash Jeremy Diamond 2015-07-27 03:44:46 -07:00