Commit Graph

Select branches

Hide Pull Requests

alex/fix-leak

fix-ctm-submap-sprites

master

release/2.8.x

release/2.9.x

#1

#10

#100

#101

#102

#103

#103/merge

#104

#105

#105/merge

#106

#107

#108

#109

#109/merge

#11

#110

#110/merge

#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

#79

#8

#80

#81

#82

#83

#84

#85

#86

#87

#88

#89

#9

#90

#91

#92

#93

#94

#95

#95/merge

#96

#97

#98

#99

2.10.1-GTNH

2.10.10-GTNH

2.10.11-GTNH-dev

2.10.11-GTNH-pre

2.10.12-GTNH

2.10.13-GTNH

2.10.14-GTNH

2.10.15-GTNH

2.10.16-GTNH

2.10.17-GTNH

2.10.18-GTNH-pre

2.10.19-GTNH

2.10.2-GTNH

2.10.3-GTNH

2.10.4-GTNH

2.10.5-GTNH

2.10.6-GTNH

2.10.7-GTNH

2.10.8-GTNH

2.10.9-GTNH

2.11.0-GTNH

2.11.1-GTNH

2.11.2-GTNH

2.11.3-GTNH

2.11.4-GTNH

2.12.0-GTNH

2.12.1-GTNH

2.12.2-GTNH

2.12.3-GTNH

2.13.0-GTNH

2.13.1-GTNH

2.13.2-GTNH

2.13.3-GTNH-pre

2.13.4-GTNH

2.14.0-GTNH

2.14.1-GTNH

2.15.0-GTNH

2.15.1-GTNH

2.15.2-GTNH

2.15.3-GTNH

2.15.4-GTNH

2.15.5-GTNH

2.16.0-GTNH

2.16.1-GTNH

2.16.10-GTNH-pre

2.16.11-GTNH

2.16.12-GTNH

2.16.13-GTNH

2.16.14-GTNH

2.16.15-GTNH

2.16.2-GTNH

2.16.3-GTNH-pre

2.16.4-GTNH

2.16.5-GTNH

2.16.6-GTNH-pre

2.16.7-GTNH-pre

2.16.8-GTNH

2.16.9-GTNH-pre

2.17.0-GTNH

2.17.1-GTNH

2.17.10-GTNH-pre

2.17.11-GTNH

2.17.12-GTNH-pre

2.17.13-GTNH

2.17.14-GTNH

2.17.16-GTNH-pre

2.17.17-GTNH-pre

2.17.18-GTNH

2.17.19-GTNH

2.17.2-GTNH-pre

2.17.20-GTNH

2.17.21-GTNH

2.17.22-GTNH

2.17.23-GTNH

2.17.24-GTNH

2.17.25-GTNH

2.17.26-GTNH

2.17.27-GTNH

2.17.28-GTNH

2.17.29-GTNH

2.17.3-GTNH

2.17.30-GTNH

2.17.31-GTNH

2.17.32-GTNH

2.17.33-GTNH

2.17.34-GTNH

2.17.4-GTNH-pre

2.17.5-GTNH

2.17.6-GTNH

2.17.7-GTNH

2.17.8-GTNH-pre

2.17.9-GTNH

2.18.0-GTNH

2.18.1-GTNH

2.9.7

2.9.8

2.9.9

vCT2.5.0

Mono Color

• 1a12b59568 Merge pull request #55 from EoD/remove-chisel-sandstone-duplicates Fenn 2014-09-15 11:29:15 +01:00
• 1b8114c820 Fixed the bracing Fenn 2014-09-15 11:27:15 +01:00
• 49ade553f0 Fix the derps from that commit, i hate git. Fenn 2014-09-15 11:25:33 +01:00
• 1dd65fd97a Merge remote-tracking branch 'origin/master' Fenn 2014-09-15 11:22:41 +01:00
• 108e5ceccc WIP left click chisel stuff Fenn 2014-09-15 11:14:40 +01:00
• 652d905ca1 Merge pull request #47 from EoD/fix-item-remapping-v2 Fenn 2014-09-15 11:14:26 +01:00
• 00c81ac21e Merge pull request #52 from EoD/localise-gui Fenn 2014-09-15 11:13:14 +01:00
• 0a788b7727 Merge pull request #48 from ViKaleidoscope/patch-2 Fenn 2014-09-15 11:12:10 +01:00
• 164d24fa74 remove duplicate sandstone blocks EoD 2014-09-14 19:52:20 +02:00
• 385ed88d91 add compatbility recipes for wrong sandstone block EoD 2014-09-14 19:49:24 +02:00
• e058360427 Fixes Pokefenn/Chisel#39 EoD 2014-09-11 18:37:08 +02:00
• 22ef94c4b9 Localise chisel gui elements EoD 2014-09-11 02:13:41 +02:00
• 2a9d3860eb Update zh_CN.lang D-dur 2014-09-10 15:52:27 +08:00
• d98c38aaf9 Closes Pokefenn/Chisel#36 EoD 2014-09-09 19:02:20 +02:00
• 480b6c3629 utitilies: add replaceTags(), update getName() EoD 2014-09-05 14:45:44 +02:00
• ffcbf444cd Revert "Manually added EoDs PR." EoD 2014-09-09 18:57:43 +02:00
• 376c485f3c Fix for crash with HEE Fenn 2014-09-06 18:02:11 +01:00
• 98ae948926 Merge pull request #40 from Adaptivity/patch-2 Fenn 2014-09-06 14:37:46 +01:00
• 3f16a666ef Manually added EoDs PR. Fenn 2014-09-06 11:46:36 +01:00
• 6b1ec65beb Merge pull request #42 from Lordmau5/master Fenn 2014-09-06 11:35:52 +01:00
• be36008786 Merge pull request #45 from GravitasShortfall/master Fenn 2014-09-06 11:28:53 +01:00
• 51677db15f Added "Laboratory Block" GravitasShortfall 2014-09-05 17:10:46 +01:00
• cac56fcdb5 Remove unnecessary "ClassNotFound"-stacktrace (mod compat.) Konata Izumi 2014-09-02 00:36:59 +02:00
• b17aae93f9 Ye... the block update is needed here ... Also version bump Konata Izumi 2014-08-31 13:55:12 +02:00
• 653a1df6c9 Changes to the left-clicking with the Chisel in-hand... Konata Izumi 2014-08-31 13:37:01 +02:00
• a1cec7aefb Update ru_RU.lang Anton 2014-08-28 22:45:13 +04:00
• e6bf5f8dd6 1.5.6b Fenn 2014-08-24 10:51:53 +01:00
• 2ec448b9de Fixed some recipe derps. Fenn 2014-08-24 10:49:00 +01:00
• 162f458bb3 Merge pull request #35 from ViKaleidoscope/patch-1 Fenn 2014-08-19 11:34:50 +01:00
• 6ffb71b831 Sound fix. Fenn 2014-08-19 10:53:37 +01:00
• 80f8962a8d Create zh_CN.lang Princess 2014-08-16 02:00:19 +08:00
• dc3639565a Bluepower support added for Marble Fenn 2014-08-13 16:58:37 +01:00
• 02a7be514d Derped on that. Fenn 2014-08-11 13:46:17 +01:00
• c4557bab11 Fix for ProRed marble & chisel crafting config Fenn 2014-08-11 13:35:49 +01:00
• 08e41f1c84 Moved to post init to be safe. Fenn 2014-08-10 12:15:32 +01:00
• d844b446e4 That -should- be a fix for PR marble stuff. Fenn 2014-08-10 12:12:39 +01:00
• 0701588032 1.5.6a updated :p Fenn 2014-08-08 17:21:41 +01:00
• 4152cbfd43 Fixed the stained glass carving issues. Fenn 2014-08-08 17:18:09 +01:00
• 6489e7eb25 Merge pull request #32 from Parker8283/waila Fenn 2014-08-08 15:44:55 +01:00
• 88edbebedc Added Waila Integration Parker 2014-08-08 09:06:15 -04:00
• f944e1dc8b Forced normal render of Lavastone. Fenn 2014-08-07 20:58:26 +01:00
• af58f026d6 Fixed configuration and other stuff. Fenn 2014-07-26 09:17:49 +01:00
• a8152e626f Seperated configurations into a new class. Fenn 2014-07-17 22:05:29 +01:00
• 0eccfcda10 Merge pull request #28 from xbony2/patch-1 Pokefenn 2014-07-17 16:10:46 +01:00
• fca815d17c Goodbye .DS_Store xbony2 2014-07-17 09:34:01 -04:00
• 32dbd9a4aa 1.5.6 and also recipes Fenn 2014-07-12 11:54:00 +01:00
• 3d19ced0d9 Woolen Clay ;) Fenn 2014-07-12 11:11:34 +01:00
• 9143e19089 Config for mossy blocks being made from stone Fenn 2014-07-12 10:54:47 +01:00
• 6a39b1f230 Paperwalls? Paperwalls! Fenn 2014-07-11 17:39:36 +01:00
• 25f9f1400d Things to 1.5.5a... Fenn 2014-07-05 19:36:32 +01:00
• e5d3a873d8 *shakes fist at @zombiepig333 * fixes #24 Fenn 2014-07-05 19:35:10 +01:00
• 1ae9faae93 Merge pull request #23 from al3xthegre4/master Pokefenn 2014-07-05 13:33:02 +01:00
• 55bf10f4f5 This always bugged me about Chisel. al3xthegre4 2014-07-05 13:23:24 +01:00
• 69e83e80c0 Why is this file here... :< Fenn 2014-07-05 09:24:55 +01:00
• 386c98a24a Gonna do 1.5.5 now Fenn 2014-07-05 09:18:21 +01:00
• 4280147ece Locale for blocks (no descriptions) Fenn 2014-07-05 09:16:05 +01:00
• 5113b1b6fb Changed the bracing style to under line on a few classes Fenn 2014-06-30 20:43:30 +01:00
• c25919d012 Obsidian blocks Fenn 2014-06-30 15:39:36 +01:00
• 247f323724 Ice stairs Fenn 2014-06-30 15:16:55 +01:00
• 19d183879e Ice pillars Fenn 2014-06-30 14:56:42 +01:00
• 7e43e56837 Removed derp. Fenn 2014-06-28 18:30:36 +01:00
• 2fa7d38f05 Merge remote-tracking branch 'origin/master' Fenn 2014-06-28 18:28:51 +01:00
• 88dd4333d1 I hate git at times Fenn 2014-06-28 18:26:04 +01:00
• 131d12de21 Merge pull request #21 from zombiepig333/master Pokefenn 2014-06-28 17:12:05 +01:00
• 0da37ebff2 Way too busy today to finish the entire PR, should finish tomorrow. zombiepig333 2014-06-27 18:35:01 -07:00
• a6fbd50231 Fixed a few derps, localization coming along. zombiepig333 2014-06-27 18:07:23 -07:00
• 9cce5018c5 Trying out the config gui to see if it would be a good idea. zombiepig333 2014-06-26 13:43:52 -07:00
• ea95d10666 More localizations!! zombiepig333 2014-06-26 12:51:47 -07:00
• 02c6f40e2f Bumped to Forge 1149 zombiepig333 2014-06-26 12:16:54 -07:00
• 7437932cdd Merge pull request #1 from Pokefenn/master zombiepig333 2014-06-26 11:59:10 -07:00
• 2c1e6ce7fe Cobblestone Fenn 2014-06-26 15:51:01 +01:00
• 3700724133 Diamond block locale and also fixed bracing Fenn 2014-06-26 15:45:31 +01:00
• 8d5568509a Merge pull request #19 from zombiepig333/master Pokefenn 2014-06-26 15:15:13 +01:00
• 5977d977a5 Took time to port to 1.7.10pre4, more localization work. -The stair descriptions hate me!!! zombiepig333 2014-06-24 16:22:06 -07:00
• dfaf4ed0f9 Localization disaster pt1 zombiepig333 2014-06-23 21:42:23 -07:00
• 1157c3cf4a Beginning of the localization ablockalypse. zombiepig333 2014-06-23 20:19:11 -07:00
• 06b76ff06e Ready for build g Fenn 2014-06-21 10:42:12 +01:00
• fe2c7e8c87 Fixed the crash with chisels <,< Fenn 2014-06-21 10:41:26 +01:00
• 3ef784b494 Updated the forge version, ready for later builds Fenn 2014-06-17 17:30:17 +01:00
• dda524ceb9 Using GameRegistry instead of CraftingManager Fenn 2014-06-16 19:11:29 +01:00
• 56d6ec1ed9 Fixed dirt stuff. Fenn 2014-06-16 18:25:53 +01:00
• b3c74bf57f Im a idiot. Fenn 2014-06-14 10:56:04 +01:00
• 0780f7169a Fixed the crash bug in the latest forge, i think. Fenn 2014-06-14 10:49:32 +01:00
• 8312a8eb81 Fixed dirt stuffs Fenn 2014-06-10 22:46:04 +01:00
• 759be8775f Added in road line recipes, clears #9 Fenn 2014-06-09 21:32:33 +01:00
• 6026e2f7ec Merge pull request #10 from anti344/master Pokefenn 2014-06-09 17:01:43 +01:00
• a362f7234e Removed unnessesary comment Anton 2014-06-06 18:38:58 +03:00
• 4fe3ff22e0 Connected blocks breaking render Anton 2014-06-06 18:37:39 +03:00
• 065a13fac5 Updated gradle and mcmod.info Fenn 2014-06-04 23:05:36 +01:00
• 77cb4055e4 1.5.4e Fenn 2014-06-01 14:01:12 +01:00
• 63d7a76318 Metal/Gem blocks can be used for beacon bases, suggestion from GregoriousT :P Fenn 2014-05-31 20:29:35 +01:00
• 93cdfa4905 Changed damage dropped on Glowstone block this fixes #8 Fenn 2014-05-30 16:19:07 +01:00
• 1df88f5587 Fixed a minor bug Fenn 2014-05-23 22:44:19 +01:00
• 19826d4d91 Merge pull request #7 from Adaptivity/patch-1 Pokefenn 2014-05-15 08:23:09 +01:00
• 7d7c87eeca Create ru_RU.lang Anton 2014-05-15 10:07:05 +04:00
• 82a6c90c8c 1.5.4c, fixed a crash bug Fenn 2014-05-12 15:10:22 +01:00
• d7f9007a28 STOP TELLING ME HOW TO LIVE MY LIFE Fenn 2014-05-12 08:33:43 +01:00
• b2c052e577 Merge pull request #6 from joshiejack/patch-1 Pokefenn 2014-05-12 08:30:56 +01:00
• aa4e28dc47 Update ChiselModCompatibility.java joshiejack 2014-05-12 05:58:22 +01:00
• 46904ad5e6 There, gradle things~~~ Fenn 2014-05-05 20:12:34 +01:00