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

• 043e37da90 Update ctmlib to 1.0.0.3, this should fix the cirular reference issues tterrag1098 2015-06-22 16:28:12 -04:00
• 24c15c870e Update ctmlib to 1.0.0.3, this should fix the cirular reference issues tterrag1098 2015-06-22 16:28:12 -04:00
• 8ef057e0f1 Fix maven publishing test tterrag1098 2015-06-22 16:20:24 -04:00
• 8ad16f1a20 Fix maven publishing test tterrag1098 2015-06-22 16:20:24 -04:00
• 931fb09e0d Merge branch 'dev' of https://github.com/TheCricket/Chisel-2.git into dev tterrag1098 2015-06-22 16:07:00 -04:00
• 5cc3f2a3e0 Merge branch 'dev' of https://github.com/TheCricket/Chisel-2.git into dev tterrag1098 2015-06-22 16:07:00 -04:00
• 659d58aca1 Add ctmlib version tterrag1098 2015-06-22 16:06:22 -04:00
• 114327445b Add ctmlib version tterrag1098 2015-06-22 16:06:22 -04:00
• 85ec5c9c45 Merge branch 'dev' of https://github.com/TheCricket/Chisel-2 into dev Cricket 2015-06-22 16:03:19 -04:00
• e0fea80ac9 Merge branch 'dev' of https://github.com/TheCricket/Chisel-2 into dev Cricket 2015-06-22 16:03:19 -04:00
• 763160baa3 Beacons are done but they render oddly Cricket 2015-06-22 16:00:35 -04:00
• d9447cbfba Beacons are done but they render oddly Cricket 2015-06-22 16:00:35 -04:00
• 395b0a7762 Fix import tterrag1098 2015-06-22 15:42:46 -04:00
• f724d6ff7b Fix import tterrag1098 2015-06-22 15:42:46 -04:00
• 78ffa78b48 Merge branch 'dev' into ctmlib tterrag1098 2015-06-22 15:42:01 -04:00
• 7e2157ebad Merge branch 'dev' into ctmlib tterrag1098 2015-06-22 15:42:01 -04:00
• 19f3ca733b Fix this AE2 mess. This code is tested with stable9 and works fine. tterrag1098 2015-06-22 15:39:56 -04:00
• 12381c3a76 Fix this AE2 mess. This code is tested with stable9 and works fine. tterrag1098 2015-06-22 15:39:56 -04:00
• 0f0b91ec96 fixed controllers and removed AE2 support Cricket 2015-06-22 14:21:22 -04:00
• 0d434ff9b3 fixed controllers and removed AE2 support Cricket 2015-06-22 14:21:22 -04:00
• 5869259396 Update buildscript to shade CTMLib (once it is on maven) tterrag1098 2015-06-22 13:58:38 -04:00
• 444e5cfd8e Update buildscript to shade CTMLib (once it is on maven) tterrag1098 2015-06-22 13:58:38 -04:00
• ca0dec38ce Spelling error Cricket 2015-06-22 13:13:47 -04:00
• 69c5f5d07e Spelling error Cricket 2015-06-22 13:13:47 -04:00
• 97e094ecfe Merge pull request #338 from nark31/KR_Translate Cricket 2015-06-22 13:12:09 -04:00
• 119afb8d7e Merge pull request #338 from nark31/KR_Translate Cricket 2015-06-22 13:12:09 -04:00
• 3136336ef5 Update ko_KR.lang Nark 2015-06-23 01:25:30 +09:00
• bda36c3e28 Update ko_KR.lang Nark 2015-06-23 01:25:30 +09:00
• 11f8d54180 👯 Cricket 2015-06-21 22:34:17 -04:00
• c513924af7 👯 Cricket 2015-06-21 22:34:17 -04:00
• 0a0800fae8 Controllers are done Cricket 2015-06-21 22:28:46 -04:00
• 09f12d5194 Controllers are done Cricket 2015-06-21 22:28:46 -04:00
• 5e614b5983 Allows the changing the config in game Cricket 2015-06-20 22:18:13 -04:00
• 9b6e1495d4 Allows the changing the config in game Cricket 2015-06-20 22:18:13 -04:00
• e582719d9e Fixes #334 #333 and #330 Cricket 2015-06-20 22:16:00 -04:00
• afce955cd1 Fixes #334 #333 and #330 Cricket 2015-06-20 22:16:00 -04:00
• 57901aec23 Cleanup smbarbour's code Cricket 2015-06-20 21:54:17 -04:00
• a92b236ae8 Cleanup smbarbour's code Cricket 2015-06-20 21:54:17 -04:00
• eaacc7b95e Merge branch 'Repair' of https://github.com/smbarbour/Chisel-2 into dev Cricket 2015-06-20 21:49:34 -04:00
• 3d03f41985 Merge branch 'Repair' of https://github.com/smbarbour/Chisel-2 into dev Cricket 2015-06-20 21:49:34 -04:00
• 0c041357ca Implement repairs Scott Barbour 2015-06-19 18:10:44 -05:00
• a3f7f217ac Implement repairs Scott Barbour 2015-06-19 18:10:44 -05:00
• 8ac8e4f27f This should work, not tested tterrag1098 2015-06-13 01:27:10 -04:00
• c014e93d8d This should work, not tested tterrag1098 2015-06-13 01:27:10 -04:00
• 9291d30dca Unfinished don't touch tterrag1098 2015-06-13 00:20:18 -04:00
• f5101a279b Unfinished don't touch tterrag1098 2015-06-13 00:20:18 -04:00
• 988fc949c3 added minecreatr and a missing texture Cricket 2015-06-06 20:32:25 -04:00
• 37ad501b2a added minecreatr and a missing texture Cricket 2015-06-06 20:32:25 -04:00
• d22cce273a That should fix ee3 Cricket 2015-06-04 13:49:58 -04:00
• 4951fd31ad That should fix ee3 Cricket 2015-06-04 13:49:58 -04:00
• e0f01ef0d3 Update PlayerSpecials.java Cricket 2015-06-03 19:49:53 -04:00
• 7bdc0487f0 Update PlayerSpecials.java Cricket 2015-06-03 19:49:53 -04:00
• 45526e5dd9 Move over rendering stuff to ctmlib tterrag1098 2015-06-03 17:43:03 -04:00
• fcec71a52d Move over rendering stuff to ctmlib tterrag1098 2015-06-03 17:43:03 -04:00
• 15b462cb1b Merge remote-tracking branch 'origin/dev' into dev Cricket 2015-06-02 11:33:54 -04:00
• af59d14bc5 Merge remote-tracking branch 'origin/dev' into dev Cricket 2015-06-02 11:33:54 -04:00
• f62b444509 its was missing a SideOnly Cricket 2015-06-02 11:33:44 -04:00
• 4a2eced4aa its was missing a SideOnly Cricket 2015-06-02 11:33:44 -04:00
• 8826bbde4b Fix reversion upgrade implementation tterrag1098 2015-06-02 00:46:23 -04:00
• ed5162104e Fix reversion upgrade implementation tterrag1098 2015-06-02 00:46:23 -04:00
• 783b75f704 I have no idea why this gets NPE's all the time Cricket 2015-06-01 18:24:52 -04:00
• d64a379b41 I have no idea why this gets NPE's all the time Cricket 2015-06-01 18:24:52 -04:00
• 20146e5a47 Revert "pushing broken code, its fun to look at though" Cricket 2015-06-01 17:06:53 -04:00
• 55aac1030b Revert "pushing broken code, its fun to look at though" Cricket 2015-06-01 17:06:53 -04:00
• 49c9a7a1a5 pushing broken code, its fun to look at though Cricket 2015-06-01 14:15:05 -04:00
• 4ba78dd9b7 pushing broken code, its fun to look at though Cricket 2015-06-01 14:15:05 -04:00
• 47fcd33c65 fix the boo boo Cricket 2015-05-30 17:54:51 -04:00
• 86ef50c2fc fix the boo boo Cricket 2015-05-30 17:54:51 -04:00
• 28b7b4b296 Merge branch 'dev' of https://github.com/TheCricket/Chisel-2 into dev Cricket 2015-05-30 17:36:29 -04:00
• 4d7c3424d4 Merge branch 'dev' of https://github.com/TheCricket/Chisel-2 into dev Cricket 2015-05-30 17:36:29 -04:00
• 5744ed64f6 Those are the textures for it, I can't figure out the CTM logic. Plus I made it so carvable glow can be colored by the dye or regular Cricket 2015-05-30 17:34:02 -04:00
• 46bea5a0a3 Those are the textures for it, I can't figure out the CTM logic. Plus I made it so carvable glow can be colored by the dye or regular Cricket 2015-05-30 17:34:02 -04:00
• 9a6d990203 Merge pull request #325 from Kodos-Atoz/patch-1 Drullkus 2015-05-29 19:45:36 -07:00
• c688c0fe37 Merge pull request #325 from Kodos-Atoz/patch-1 Drullkus 2015-05-29 19:45:36 -07:00
• aa63e2fd63 Made Hex Plating Blastproof Kodos Atoz 2015-05-29 21:39:03 -05:00
• a48de38fdb Made Hex Plating Blastproof Kodos Atoz 2015-05-29 21:39:03 -05:00
• 58f12b442a Merge branch 'dev' of https://github.com/TheCricket/Chisel-2.git into dev tterrag1098 2015-05-29 15:52:27 -04:00
• cb1c69d850 Merge branch 'dev' of https://github.com/TheCricket/Chisel-2.git into dev tterrag1098 2015-05-29 15:52:27 -04:00
• c0f182d7f7 Fix stat additions tterrag1098 2015-05-29 15:52:03 -04:00
• 841ad0b9aa Fix stat additions tterrag1098 2015-05-29 15:52:03 -04:00
• fc5cfa80e9 Merge remote-tracking branch 'origin/dev' into dev Cricket 2015-05-29 15:27:52 -04:00
• 11e9b23c50 Merge remote-tracking branch 'origin/dev' into dev Cricket 2015-05-29 15:27:52 -04:00
• 6bbdbaa1fa it was oreDicted wrong but #317 is fixed from it I guess Cricket 2015-05-29 15:27:43 -04:00
• 39e7715f37 it was oreDicted wrong but #317 is fixed from it I guess Cricket 2015-05-29 15:27:43 -04:00
• 8207002465 Do not register oredict before registering the block tterrag1098 2015-05-29 15:13:44 -04:00
• 354ad4fe76 Do not register oredict before registering the block tterrag1098 2015-05-29 15:13:44 -04:00
• 388afeac49 @Drullkus this texture is not unused tterrag1098 2015-05-29 15:08:03 -04:00
• 5e25640338 @Drullkus this texture is not unused tterrag1098 2015-05-29 15:08:03 -04:00
• aa2ecb9be0 Ever wondered how many blocks you have chiseled? Cricket 2015-05-29 14:17:50 -04:00
• ee10932174 Ever wondered how many blocks you have chiseled? Cricket 2015-05-29 14:17:50 -04:00
• f3dafcb5ae Fix the gitignore Cricket 2015-05-29 13:40:02 -04:00
• 7aed838c66 Fix the gitignore Cricket 2015-05-29 13:40:02 -04:00
• 0cf67725d7 Actually registers the 1.8 oreDicts properly Cricket 2015-05-29 13:35:22 -04:00
• a49c139db7 Actually registers the 1.8 oreDicts properly Cricket 2015-05-29 13:35:22 -04:00
• eb0955587c Merge remote-tracking branch 'origin/dev' into dev commit 1a47c78556. Cricket 2015-05-29 13:29:54 -04:00
• 7590127641 Merge remote-tracking branch 'origin/dev' into dev commit 1a47c78556. Cricket 2015-05-29 13:29:54 -04:00
• ee86d65311 Register 1.8 oredicts properly. warlordjones 2015-05-28 20:57:22 +01:00
• 7046590e33 Register 1.8 oredicts properly. warlordjones 2015-05-28 20:57:22 +01:00
• 0839ba76f9 Register 1.8 stones in oredict. (Closes #305) warlordjones 2015-05-28 20:46:12 +01:00
• 743004abcf Register 1.8 stones in oredict. (Closes #305) warlordjones 2015-05-28 20:46:12 +01:00